[Bf-blender-cvs] [8fe336c] master: Fix T4284: Drawing modified curves crashes

[Campbell Barton]

Commit: 8fe336ce7e726c2a800c8648e5118576e77b1ddf
Author: Campbell Barton
Date:   Tue Dec 9 14:37:47 2014 +0100
Branches: master
https://developer.blender.org/rB8fe336ce7e726c2a800c8648e5118576e77b1ddf

Fix T4284: Drawing modified curves crashes

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

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 79d660f..a63b166 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -6857,15 +6857,18 @@ static void drawObjectSelect(Scene *scene, View3D *v3d, ARegion *ar, Base *base,
 	glDepthMask(0);
 	
 	if (ELEM(ob->type, OB_FONT, OB_CURVE, OB_SURF)) {
-		DerivedMesh *dm = ob->derivedFinal;
+		DerivedMesh *dm;
 		bool has_faces = false;
 
-		if (dm)
-			DM_update_materials(dm, ob);
 #ifdef SEQUENCER_DAG_WORKAROUND
 		ensure_curve_cache(scene, ob);
 #endif
 
+		dm = ob->derivedFinal;
+		if (dm) {
+			DM_update_materials(dm, ob);
+		}
+
 		if (dm) {
 			has_faces = dm->getNumTessFaces(dm) > 0;
 		}