[Bf-blender-cvs] [accd608] blender-v2.74-release: Fix for invalid buffer access on zero-face meshes

[Campbell Barton]

Commit: accd6083a510d3684a3ae372ad48e4794f6a4eaa
Author: Campbell Barton
Date:   Mon Mar 30 20:49:13 2015 +1100
Branches: blender-v2.74-release
https://developer.blender.org/rBaccd6083a510d3684a3ae372ad48e4794f6a4eaa

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);
 		}