[Bf-blender-cvs] [55c9b35] master: Fix mistake in recent DM material changes

Campbell Barton noreply at git.blender.org
Thu Apr 17 10:06:52 CEST 2014


Commit: 55c9b352c2bd023640e75e51778b466125481a68
Author: Campbell Barton
Date:   Thu Apr 17 18:05:57 2014 +1000
https://developer.blender.org/rB55c9b352c2bd023640e75e51778b466125481a68

Fix mistake in recent DM material changes

===================================================================

M	source/blender/editors/space_view3d/drawobject.c

===================================================================

diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index 178a7aa..02fad5d 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -7908,7 +7908,7 @@ static void draw_object_mesh_instance(Scene *scene, View3D *v3d, RegionView3D *r
 	
 	if (ob->mode & OB_MODE_EDIT) {
 		edm = editbmesh_get_derived_base(ob, me->edit_btmesh);
-		DM_update_materials(dm, ob);
+		DM_update_materials(edm, ob);
 	}
 	else {
 		dm = mesh_get_derived_final(scene, ob, CD_MASK_BAREMESH);




More information about the Bf-blender-cvs mailing list