From febc30581adbdee46a8d32a15a2a1d4a1d929d7e Mon Sep 17 00:00:00 2001 From: Guido Ranzuglia Date: Fri, 1 Jul 2016 10:05:50 +0200 Subject: [PATCH] - removed "per point fixed color provides same color of the per mesh color" bug --- wrap/gl/gl_mesh_attributes_multi_viewer_bo_manager.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/wrap/gl/gl_mesh_attributes_multi_viewer_bo_manager.h b/wrap/gl/gl_mesh_attributes_multi_viewer_bo_manager.h index 8dee6ed9..0c118367 100644 --- a/wrap/gl/gl_mesh_attributes_multi_viewer_bo_manager.h +++ b/wrap/gl/gl_mesh_attributes_multi_viewer_bo_manager.h @@ -880,8 +880,6 @@ namespace vcg if (attributestobeupdated[INT_ATT_NAMES::ATT_VERTINDICES]) { - - //size_t tsz = _bo[INT_ATT_NAMES::ATT_VERTINDICES]->_components * _bo[INT_ATT_NAMES::ATT_VERTINDICES]->getSizeOfGLType() * chunksize; glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _bo[INT_ATT_NAMES::ATT_VERTINDICES]->_bohandle); glBufferSubData(GL_ELEMENT_ARRAY_BUFFER,chunkingpu * facechunk * _bo[INT_ATT_NAMES::ATT_VERTINDICES]->_components * _bo[INT_ATT_NAMES::ATT_VERTINDICES]->getSizeOfGLType(),_bo[INT_ATT_NAMES::ATT_VERTINDICES]->_components * _bo[INT_ATT_NAMES::ATT_VERTINDICES]->getSizeOfGLType() * chunksize,&ti[0]); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); @@ -1568,7 +1566,10 @@ namespace vcg glEnable(GL_COLOR_MATERIAL); if ((isgloptsvalid) && ((glopts->_perpoint_fixed_color_enabled) || (glopts->_perpoint_mesh_color_enabled))) - glColor(glopts->_perpoint_fixed_color); + if (glopts->_perpoint_fixed_color_enabled) + glColor(glopts->_perpoint_fixed_color); + else + glColor(glopts->_permesh_color); if (req[INT_ATT_NAMES::ATT_VERTCOLOR])