[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36822] trunk/blender/source/blender/ editors/object/object_relations.c: fix [#27443] " Make single user Material+Tex" doesn't work for textures

Campbell Barton ideasman42 at gmail.com
Sun May 22 19:10:24 CEST 2011


Revision: 36822
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36822
Author:   campbellbarton
Date:     2011-05-22 17:10:24 +0000 (Sun, 22 May 2011)
Log Message:
-----------
fix [#27443] "Make single user Material+Tex" doesn't work for textures

Modified Paths:
--------------
    trunk/blender/source/blender/editors/object/object_relations.c

Modified: trunk/blender/source/blender/editors/object/object_relations.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_relations.c	2011-05-22 16:29:51 UTC (rev 36821)
+++ trunk/blender/source/blender/editors/object/object_relations.c	2011-05-22 17:10:24 UTC (rev 36822)
@@ -1543,11 +1543,12 @@
 
 						if(do_textures) {
 							for(b=0; b<MAX_MTEX; b++) {
-								if(ma->mtex[b] && ma->mtex[b]->tex) {
-									tex= ma->mtex[b]->tex;
+								if(ma->mtex[b] && (tex= ma->mtex[b]->tex)) {
 									if(tex->id.us>1) {
-										ma->mtex[b]->tex= copy_texture(tex);
 										tex->id.us--;
+										tex= copy_texture(tex);
+										BKE_copy_animdata_id_action(&tex->id);
+										ma->mtex[b]->tex= tex;
 									}
 								}
 							}
@@ -1818,11 +1819,12 @@
 		single_obdata_users(bmain, scene, flag);
 
 	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"))
 		single_mat_users(scene, flag, TRUE);
-
+#endif
 	if(RNA_boolean_get(op->ptr, "animation"))
 		single_object_action_users(scene, flag);
 




More information about the Bf-blender-cvs mailing list