[Bf-blender-cvs] [704b1bf7f05] custom-manipulators: Use face-group color
Campbell Barton
noreply at git.blender.org
Mon May 29 17:49:16 CEST 2017
Commit: 704b1bf7f05ec3761b16162b7b502f72a26361ac
Author: Campbell Barton
Date: Tue May 30 01:49:06 2017 +1000
Branches: custom-manipulators
https://developer.blender.org/rB704b1bf7f05ec3761b16162b7b502f72a26361ac
Use face-group color
===================================================================
M source/blender/editors/space_view3d/drawobject.c
===================================================================
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index b8aebda60b9..4e57e69db85 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -9826,7 +9826,7 @@ void ED_draw_object_facemap(Scene *scene, Object *ob, const float col[4], const
unsigned int pos = VertexFormat_add_attrib(format, "pos", COMP_F32, 3, KEEP_FLOAT);
immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR);
- immUniformColor4f(1.0, 1.0, 1.0, 2.0);
+ immUniformColor4fv(col);
/* XXX, alpha isn't working yet, not sure why. */
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
More information about the Bf-blender-cvs
mailing list