From 8e29c7b76f23028e679e7dc97c90eba795604b5d Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Wed, 5 Jan 2011 13:15:29 +0000 Subject: [PATCH] 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. --- source/blender/blenkernel/intern/material.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index 3f18e7f3723..2d123302c3d 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -786,6 +786,13 @@ int object_add_material_slot(Object *ob) 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;