Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix [#27443] "Make single user Material+Tex" doesn't work for textures

Browse Source
This commit is contained in:
Campbell Barton
2011-05-22 17:10:24 +00:00
parent d02480cdaa
commit bf65ed9447
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/editors/object/object_relations.c
View File

@@ -1543,11 +1543,12 @@ static void single_mat_users(Scene *scene, int flag, int do_textures)
if(do_textures) { if(do_textures) {
for(b=0; b<MAX_MTEX; b++) { for(b=0; b<MAX_MTEX; b++) {
if(ma->mtex[b] && ma->mtex[b]->tex) { if(ma->mtex[b] && (tex= ma->mtex[b]->tex)) {
tex= ma->mtex[b]->tex;
if(tex->id.us>1) { if(tex->id.us>1) {
ma->mtex[b]->tex= copy_texture(tex);
tex->id.us--; tex->id.us--;
tex= copy_texture(tex);
BKE_copy_animdata_id_action(&tex->id);
ma->mtex[b]->tex= tex;
} }
} }
} }
@@ -1818,11 +1819,12 @@ static int make_single_user_exec(bContext *C, wmOperator *op)
single_obdata_users(bmain, scene, flag); single_obdata_users(bmain, scene, flag);
if(RNA_boolean_get(op->ptr, "material")) if(RNA_boolean_get(op->ptr, "material"))
single_mat_users(scene, flag, FALSE); single_mat_users(scene, flag, RNA_boolean_get(op->ptr, "texture"));
#if 0 /* can't do this separate from materials */
if(RNA_boolean_get(op->ptr, "texture")) if(RNA_boolean_get(op->ptr, "texture"))
single_mat_users(scene, flag, TRUE); single_mat_users(scene, flag, TRUE);
#endif
if(RNA_boolean_get(op->ptr, "animation")) if(RNA_boolean_get(op->ptr, "animation"))
single_object_action_users(scene, flag); single_object_action_users(scene, flag);