From 684bb9ecfbd0ae94ddafd12b495170875fe40cef Mon Sep 17 00:00:00 2001 From: Guido Ranzuglia Date: Thu, 15 Sep 2016 06:10:18 +0200 Subject: [PATCH] - fixed "no per mesh color applied on polygonal wire rendering" bug --- wrap/gl/gl_mesh_attributes_multi_viewer_bo_manager.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 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 a7484f75..e084448e 100644 --- a/wrap/gl/gl_mesh_attributes_multi_viewer_bo_manager.h +++ b/wrap/gl/gl_mesh_attributes_multi_viewer_bo_manager.h @@ -1731,8 +1731,7 @@ namespace vcg if (_mesh.VN() == 0) return; glPushAttrib(GL_ALL_ATTRIB_BITS); - - + bool isgloptsvalid = (glopts != NULL); glEnable(GL_COLOR_MATERIAL); @@ -1751,8 +1750,13 @@ namespace vcg if (!(isgloptsvalid) || colordefinedenabled) { vcg::Color4b tmpcol = vcg::Color4b(vcg::Color4b::DarkGray); - if (colordefinedenabled) - tmpcol = glopts->_perwire_fixed_color; + if (colordefinedenabled) + { + if (glopts->_perwire_fixed_color_enabled) + tmpcol = glopts->_perwire_fixed_color; + else + tmpcol = _mesh.cC(); + } glColor(tmpcol); }