[Bf-blender-cvs] [8ffd46d] wiggly-widgets: Fix crash with decimate modifier on zero.

[Antony Riakiotakis]

Commit: 8ffd46d1398c1817f256119c26bf1ccb6773ac30
Author: Antony Riakiotakis
Date:   Wed Dec 17 16:53:05 2014 +0100
Branches: wiggly-widgets
https://developer.blender.org/rB8ffd46d1398c1817f256119c26bf1ccb6773ac30

Fix crash with decimate modifier on zero.

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

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 7cdeee8..e842277 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -8204,16 +8204,20 @@ void draw_object_facemap(Scene *scene, struct Object 
*ob, int facemap)
        
        GPU_facemap_setup(dm);
 
+       glColor4f(0.7, 1.0, 1.0, 0.5);
+       
        glPushAttrib(GL_ENABLE_BIT);
        glEnable(GL_BLEND);
        glDisable(GL_LIGHTING);
-       glColor4f(0.7, 1.0, 1.0, 0.5);
-       if (dm->drawObject->facemapindices->use_vbo)
-               glDrawElements(GL_TRIANGLES, 
dm->drawObject->facemap_count[facemap], GL_UNSIGNED_INT, 
-                              (int *)NULL + 
dm->drawObject->facemap_start[facemap]);
-       else
-               glDrawElements(GL_TRIANGLES, 
dm->drawObject->facemap_count[facemap], GL_UNSIGNED_INT,
-                              (int *)dm->drawObject->facemapindices->pointer + 
dm->drawObject->facemap_start[facemap]);
+
+       if (dm->drawObject->facemapindices) {
+               if (dm->drawObject->facemapindices->use_vbo)
+                       glDrawElements(GL_TRIANGLES, 
dm->drawObject->facemap_count[facemap], GL_UNSIGNED_INT, 
+                                      (int *)NULL + 
dm->drawObject->facemap_start[facemap]);
+               else
+                       glDrawElements(GL_TRIANGLES, 
dm->drawObject->facemap_count[facemap], GL_UNSIGNED_INT,
+                                      (int 
*)dm->drawObject->facemapindices->pointer + 
dm->drawObject->facemap_start[facemap]);
+       }
        glPopAttrib();
 
        GPU_buffer_unbind();

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs