[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46157] trunk/blender/source/blender/ blenkernel/intern/editderivedmesh.c: Fix #31162: Applying textures to rigged models causes crash and no textures in appear in edit mode

[Sergey Sharybin]

Revision: 46157
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46157
Author:   nazgul
Date:     2012-05-01 15:59:28 +0000 (Tue, 01 May 2012)
Log Message:
-----------
Fix #31162: Applying textures to rigged models causes crash and no textures in appear in edit mode

Issue was caused by doing stuff like binding textures from glBegin/glEnd block.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c

Modified: trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c	2012-05-01 15:21:29 UTC (rev 46156)
+++ trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c	2012-05-01 15:59:28 UTC (rev 46157)
@@ -815,7 +815,6 @@
 	if (vertexCos) {
 		BM_mesh_elem_index_ensure(bm, BM_VERT);
 
-		glBegin(GL_TRIANGLES);
 		for (i=0; i<em->tottri; i++) {
 			BMLoop **ls = em->looptris[i];
 			MTexPoly *tp= has_uv ? CustomData_bmesh_get(&bm->pdata, ls[0]->f->head.data, CD_MTEXPOLY) : NULL;
@@ -839,6 +838,7 @@
 
 			if (draw_option != DM_DRAW_OPTION_SKIP) {
 
+				glBegin(GL_TRIANGLES);
 				if (!drawSmooth) {
 					glNormal3fv(bmdm->polyNos[BM_elem_index_get(efa)]);
 
@@ -880,9 +880,9 @@
 					glNormal3fv(vertexNos[BM_elem_index_get(ls[2]->v)]);
 					glVertex3fv(vertexCos[BM_elem_index_get(ls[2]->v)]);
 				}
+				glEnd();
 			}
 		}
-		glEnd();
 	}
 	else {
 		BM_mesh_elem_index_ensure(bm, BM_VERT);