[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34095] trunk/blender/source/blender/ blenkernel/intern/material.c: Material slots: on adding a new one, the material datablock is now copied again

Brecht Van Lommel brechtvanlommel at pandora.be
Wed Jan 5 14:15:29 CET 2011


Revision: 34095
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=34095
Author:   blendix
Date:     2011-01-05 14:15:29 +0100 (Wed, 05 Jan 2011)

Log Message:
-----------
Material slots: on adding a new one, the material datablock is now copied again
like in 2.4x. This can result in material datablocks you don't need, but not
doing it seems to cause too much confusion.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/material.c

Modified: trunk/blender/source/blender/blenkernel/intern/material.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/material.c	2011-01-05 12:04:06 UTC (rev 34094)
+++ trunk/blender/source/blender/blenkernel/intern/material.c	2011-01-05 13:15:29 UTC (rev 34095)
@@ -786,6 +786,13 @@
 	
 	ma= give_current_material(ob, ob->actcol);
 
+    if(ma == NULL)
+		ma= add_material("Material");
+	else
+		ma= copy_material(ma);
+
+	id_us_min(&ma->id);
+
 	assign_material(ob, ma, ob->totcol+1);
 	ob->actcol= ob->totcol;
 	return TRUE;





More information about the Bf-blender-cvs mailing list