diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2010-12-26 16:01:02 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2010-12-26 16:01:02 +0300 |
| commit | 31eadb358d0f186c5e9912dd1ac0bbeaf5786cf3 (patch) | |
| tree | b2f193f29a7e1e52d5a55545acc14ef064ee7cb1 /source/blender/blenkernel/intern/cdderivedmesh.c | |
| parent | b281f105c97be482df54229f2d25967d97577425 (diff) | |
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.
Diffstat (limited to 'source/blender/blenkernel/intern/cdderivedmesh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/cdderivedmesh.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index d6c91c3c908..8030a3655ad 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -744,6 +744,7 @@ static void cdDM_drawFacesTex_common(DerivedMesh *dm, 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 @@ static void cdDM_drawFacesTex_common(DerivedMesh *dm, else { if(index) { orig = index[actualFace]; + if(orig == ORIGINDEX_NONE) continue; if(drawParamsMapped) flag = drawParamsMapped(userData, orig); } |