diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-11-06 10:06:33 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-06 10:06:33 +0300 |
| commit | 80109c976cf1f43e1f1730cb827130aa270abaaa (patch) | |
| tree | 93932897c425ea9f062f6960bc50f1f265a53e32 /source/blender/makesrna/intern/rna_sculpt_paint.c | |
| parent | 900c562b71b6efcf68d649cb639cc8bc246d5899 (diff) | |
Brush: split out vertex paint tool & blend mode
- Vertex & weight paint now use the 'blend' setting.
- Weight paint now has it's own tool setting,
since weight paint doesn't deal with color - we'll likely
support different tools eventually.
Diffstat (limited to 'source/blender/makesrna/intern/rna_sculpt_paint.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_sculpt_paint.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c b/source/blender/makesrna/intern/rna_sculpt_paint.c index a90ab01fc07..a97c971e2d3 100644 --- a/source/blender/makesrna/intern/rna_sculpt_paint.c +++ b/source/blender/makesrna/intern/rna_sculpt_paint.c @@ -333,7 +333,7 @@ static bool rna_Brush_mode_with_tool_poll(PointerRNA *ptr, PointerRNA value) mode = OB_MODE_VERTEX_PAINT; } else if (paint_contains_brush_slot(&ts->wpaint->paint, tslot, &slot_index)) { - if (slot_index != brush->vertexpaint_tool) { + if (slot_index != brush->weightpaint_tool) { return false; } mode = OB_MODE_WEIGHT_PAINT; @@ -453,7 +453,7 @@ static void rna_ImaPaint_viewport_update(Main *UNUSED(bmain), Scene *UNUSED(scen static void rna_ImaPaint_mode_update(bContext *C, PointerRNA *UNUSED(ptr)) { - Scene *scene = CTX_data_scene(C);\ + Scene *scene = CTX_data_scene(C); ViewLayer *view_layer = CTX_data_view_layer(C); Object *ob = OBACT(view_layer); |