[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57251] trunk/blender/source/blender/gpu/ intern/gpu_buffers.c: Fix textured draw mode + dyntopo crash fix to cover more cases.

[Brecht Van Lommel]

Revision: 57251
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57251
Author:   blendix
Date:     2013-06-05 15:54:41 +0000 (Wed, 05 Jun 2013)
Log Message:
-----------
Fix textured draw mode + dyntopo crash fix to cover more cases.

Modified Paths:
--------------
    trunk/blender/source/blender/gpu/intern/gpu_buffers.c

Modified: trunk/blender/source/blender/gpu/intern/gpu_buffers.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_buffers.c	2013-06-05 15:54:39 UTC (rev 57250)
+++ trunk/blender/source/blender/gpu/intern/gpu_buffers.c	2013-06-05 15:54:41 UTC (rev 57251)
@@ -2313,20 +2313,22 @@
 {
 	/* sets material from the first face, to solve properly face would need to
 	 * be sorted in buckets by materials */
-	if (buffers->totface) {
-		const MFace *f = &buffers->mface[buffers->face_indices[0]];
-		if (!setMaterial(f->mat_nr + 1, NULL))
-			return;
+	if (setMaterial) {
+		if (buffers->totface) {
+			const MFace *f = &buffers->mface[buffers->face_indices[0]];
+			if (!setMaterial(f->mat_nr + 1, NULL))
+				return;
+		}
+		else if (buffers->totgrid) {
+			const DMFlagMat *f = &buffers->grid_flag_mats[buffers->grid_indices[0]];
+			if (!setMaterial(f->mat_nr + 1, NULL))
+				return;
+		}
+		else {
+			if (!setMaterial(1, NULL))
+				return;
+		}
 	}
-	else if (buffers->totgrid) {
-		const DMFlagMat *f = &buffers->grid_flag_mats[buffers->grid_indices[0]];
-		if (!setMaterial(f->mat_nr + 1, NULL))
-			return;
-	}
-	else if (setMaterial) {
-		if (!setMaterial(1, NULL))
-			return;
-	}
 
 	glShadeModel((buffers->smooth || buffers->totface) ? GL_SMOOTH : GL_FLAT);