[Bf-blender-cvs] [d7fed89b21b] greasepencil-object: GPencil: Use right Paint for Vertex Paint mode
Antonio Vazquez
noreply at git.blender.org
Thu Nov 7 18:07:40 CET 2019
Commit: d7fed89b21b8239db9bfc42b0d15eb0a7e2c04a3
Author: Antonio Vazquez
Date: Thu Nov 7 18:05:47 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rBd7fed89b21b8239db9bfc42b0d15eb0a7e2c04a3
GPencil: Use right Paint for Vertex Paint mode
===================================================================
M source/blender/editors/gpencil/gpencil_tint.c
===================================================================
diff --git a/source/blender/editors/gpencil/gpencil_tint.c b/source/blender/editors/gpencil/gpencil_tint.c
index ee05d7f0b8e..64547e9ac42 100644
--- a/source/blender/editors/gpencil/gpencil_tint.c
+++ b/source/blender/editors/gpencil/gpencil_tint.c
@@ -294,7 +294,8 @@ static bool gptint_brush_init(bContext *C, wmOperator *op)
Scene *scene = CTX_data_scene(C);
ToolSettings *ts = CTX_data_tool_settings(C);
Object *ob = CTX_data_active_object(C);
- Paint *paint = &ts->gp_paint->paint;
+ Paint *paint = ob->mode == OB_MODE_VERTEX_GPENCIL ? &ts->gp_vertexpaint->paint :
+ &ts->gp_paint->paint;
/* set the brush using the tool */
tGP_BrushTintData *gso;
More information about the Bf-blender-cvs
mailing list