diff options
| -rw-r--r-- | source/blender/editors/space_view3d/drawmesh.c | 4 | ||||
| -rw-r--r-- | source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c index 5c8c1a42389..c1821be2078 100644 --- a/source/blender/editors/space_view3d/drawmesh.c +++ b/source/blender/editors/space_view3d/drawmesh.c @@ -167,7 +167,7 @@ static DMDrawOption draw_mesh_face_select__drawFaceOptsInv(void *userData, int i MPoly *mpoly = &me->mpoly[index]; if (!(mpoly->flag & ME_HIDE) && !(mpoly->flag & ME_FACE_SEL)) - return DM_DRAW_OPTION_NO_MCOL; /* Don't set color */ + return DM_DRAW_OPTION_NORMAL; else return DM_DRAW_OPTION_SKIP; } @@ -580,7 +580,7 @@ static DMDrawOption draw_tface__set_draw_legacy(MTexPoly *mtexpoly, const bool h glColor3f(1.0, 1.0, 1.0); } } - return DM_DRAW_OPTION_NO_MCOL; /* Don't set color */ + return DM_DRAW_OPTION_NORMAL; /* normal drawing (no mcols anyway, no need to turn off) */ } else { return DM_DRAW_OPTION_NORMAL; /* Set color from mcol */ diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp index 400fa6af22e..1589bc7efa2 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp @@ -776,7 +776,7 @@ static DMDrawOption CheckTexDM(MTexPoly *mtexpoly, const bool has_mcol, int matn unsigned char rgba[4]; current_polymat->GetMaterialRGBAColor(rgba); glColor4ubv((const GLubyte *)rgba); - return DM_DRAW_OPTION_NO_MCOL; + return DM_DRAW_OPTION_NORMAL; } return DM_DRAW_OPTION_NORMAL; } |