[Bf-blender-cvs] [e99d2e2b82d] greasepencil-object: Use brush color for lazy mouse line

Antonio Vazquez noreply at git.blender.org
Sun Jan 28 13:44:03 CET 2018


Commit: e99d2e2b82d16d567edad98cca197d5c7fce0935
Author: Antonio Vazquez
Date:   Sun Jan 28 13:17:24 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rBe99d2e2b82d16d567edad98cca197d5c7fce0935

Use brush color for lazy mouse line

===================================================================

M	source/blender/editors/gpencil/gpencil_utils.c

===================================================================

diff --git a/source/blender/editors/gpencil/gpencil_utils.c b/source/blender/editors/gpencil/gpencil_utils.c
index 1ef14970eab..e867af7e1bf 100644
--- a/source/blender/editors/gpencil/gpencil_utils.c
+++ b/source/blender/editors/gpencil/gpencil_utils.c
@@ -1345,6 +1345,7 @@ static void gp_brush_drawcursor(bContext *C, int x, int y, void *customdata)
 
 		unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
 		immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+		copy_v3_v3(color, paintbrush->curcolor);
 		immUniformColor4f(color[0], color[1], color[2], 0.8f);
 
 		immBegin(GWN_PRIM_LINES, 2);



More information about the Bf-blender-cvs mailing list