[Bf-blender-cvs] [293df68] master: Object Drawing: avoid redundant material update

[Campbell Barton]

Commit: 293df68ebdd8ecb3d301a20f909787236d5e3db6
Author: Campbell Barton
Date:   Tue May 19 17:58:24 2015 +1000
Branches: master
https://developer.blender.org/rB293df68ebdd8ecb3d301a20f909787236d5e3db6

Object Drawing: avoid redundant material update

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

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 25557af..f8676d5 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -4285,7 +4285,9 @@ static bool draw_mesh_object(Scene *scene, ARegion *ar, View3D *v3d, RegionView3
 			                                              scene->customdata_mask);
 
 		DM_update_materials(finalDM, ob);
-		DM_update_materials(cageDM, ob);
+		if (cageDM != finalDM) {
+			DM_update_materials(cageDM, ob);
+		}
 
 		if (dt > OB_WIRE) {
 			const bool glsl = draw_glsl_material(scene, ob, v3d, dt);