diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-10-10 06:56:26 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-10-10 06:56:26 +0400 |
| commit | f0cd9f987de21ce7f32c6ccdf47d0e91fe73c39e (patch) | |
| tree | aa09c2783dd772c602c59d21875e7fd16607da19 /source/blender/blenkernel | |
| parent | bdd7c2d3f439c3b71f17e46eccf78b0dcf6eb9c0 (diff) | |
- for some reason navmesh wasnt drawing when VBO was enabled.
- fix navmesh crash (may well have been from own changes)
- changing VBO's now redraws all windows - useful for checking if VBO draws differently.
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index e46ea1bbe38..53973608cd6 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -3001,7 +3001,7 @@ static void navmesh_drawColored(DerivedMesh *dm) glEnable(GL_LIGHTING);*/ glDisable(GL_LIGHTING); - if(GPU_buffer_legacy(dm) ) { + /* if(GPU_buffer_legacy(dm) ) */ { /* TODO - VBO draw code, not high priority - campbell */ DEBUG_VBO( "Using legacy code. drawNavMeshColored\n" ); //glShadeModel(GL_SMOOTH); glBegin(glmode = GL_QUADS); @@ -3062,8 +3062,10 @@ static DerivedMesh *navmesh_dm_createNavMeshForVisualization(DerivedMesh *dm) result = CDDM_copy(dm); if (!CustomData_has_layer(&result->faceData, CD_RECAST)) { int *sourceRecastData = (int*)CustomData_get_layer(&dm->faceData, CD_RECAST); - CustomData_add_layer_named(&result->faceData, CD_RECAST, CD_DUPLICATE, - sourceRecastData, maxFaces, "recastData"); + if (sourceRecastData) { + CustomData_add_layer_named(&result->faceData, CD_RECAST, CD_DUPLICATE, + sourceRecastData, maxFaces, "recastData"); + } } recastData = (int*)CustomData_get_layer(&result->faceData, CD_RECAST); |