Revision: 33893
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33893
Author: nazgul
Date: 2010-12-26 14:01:02 +0100 (Sun, 26 Dec 2010)
Log Message:
-----------
Fix for IRC reported bug from lmg:
VBO enabled, GLSL shading and bevel modifier leads to crash when entering edit
mode
Bevel modifier doe not support remapping still, so added check about original
index
in cdDM_drawFacesTex_common. Now it works like VBO-less drawing for that
special case.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
Modified: trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
2010-12-26 10:40:50 UTC (rev 33892)
+++ trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
2010-12-26 13:01:02 UTC (rev 33893)
@@ -744,6 +744,7 @@
if( !GPU_buffer_legacy(dm) ) {
glShadeModel( GL_SMOOTH );
+ lastFlag = 0;
for(i = 0; i < dm->drawObject->nelements/3; i++) {
int actualFace = dm->drawObject->faceRemap[i];
int flag = 1;
@@ -754,6 +755,7 @@
else {
if(index) {
orig = index[actualFace];
+ if(orig == ORIGINDEX_NONE)
continue;
if(drawParamsMapped)
flag =
drawParamsMapped(userData, orig);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
