[Bf-blender-cvs] [09397ac] master: Fix for invalid buffer access on zero-face meshes

[Campbell Barton]

Commit: 09397ac2c16efd073090f3c553568f4315273fa4
Author: Campbell Barton
Date:   Mon Mar 30 20:49:13 2015 +1100
Branches: master
https://developer.blender.org/rB09397ac2c16efd073090f3c553568f4315273fa4

Fix for invalid buffer access on zero-face meshes

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

M       source/blender/blenkernel/intern/cdderivedmesh.c

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

diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c 
b/source/blender/blenkernel/intern/cdderivedmesh.c
index 6b7855b..1c2c6eb 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -786,7 +786,7 @@ static void cdDM_drawMappedFaces(DerivedMesh *dm,
                if (tottri == 0) {
                        /* avoid buffer problems in following code */
                }
-               if (setDrawOptions == NULL) {
+               else if (setDrawOptions == NULL) {
                        /* just draw the entire face array */
                        glDrawArrays(GL_TRIANGLES, 0, (tottri) * 3);
                }

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