[Bf-blender-cvs] [7e2c27a] wiggly-widgets: Fix crash on face map tweak undo

[Julian Eisel]

Commit: 7e2c27a6cfd129ef70fe259fed76c8eac4439edb
Author: Julian Eisel
Date:   Sun Nov 15 19:46:42 2015 +0100
Branches: wiggly-widgets
https://developer.blender.org/rB7e2c27a6cfd129ef70fe259fed76c8eac4439edb

Fix crash on face map tweak undo

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

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 09effb8..1920840 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -8702,11 +8702,15 @@ static void draw_object_mesh_instance(Scene *scene, View3D *v3d, RegionView3D *r
 void ED_draw_object_facemap(Scene *scene, struct Object *ob, int facemap)
 {
 	DerivedMesh *dm = NULL;
-	
+
+	/* happens on undo */
+	if (ob->type != OB_MESH || !ob->data)
+		return;
+
 	dm = mesh_get_derived_final(scene, ob, CD_MASK_BAREMESH);
 	if (!dm || !CustomData_has_layer(&dm->polyData, CD_FACEMAP))
 		return;
-	
+
 	DM_update_materials(dm, ob);
 
 	glFrontFace((ob->transflag & OB_NEG_SCALE) ? GL_CW : GL_CCW);