diff options
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_edit.c | 3 | ||||
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_image.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_vertex.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/sculpt_paint/sculpt.c | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c index fc50fa7359f..1d29761bb74 100644 --- a/source/blender/editors/gpencil/gpencil_edit.c +++ b/source/blender/editors/gpencil/gpencil_edit.c @@ -282,7 +282,6 @@ static int gpencil_paintmode_toggle_exec(bContext *C, wmOperator *op) struct wmMsgBus *mbus = CTX_wm_message_bus(C); Main *bmain = CTX_data_main(C); - Scene *scene = CTX_data_scene(C); bGPdata *gpd = ED_gpencil_data_get_active(C); ToolSettings *ts = CTX_data_tool_settings(C); @@ -325,7 +324,7 @@ static int gpencil_paintmode_toggle_exec(bContext *C, wmOperator *op) if (paint->brush == NULL) { BKE_brush_gpencil_presets(C); } - BKE_paint_toolslots_brush_validate(bmain, scene, &ts->gp_paint->paint); + BKE_paint_toolslots_brush_validate(bmain, &ts->gp_paint->paint); } /* setup other modes */ diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c index be51c8071c2..4bd625c3cc6 100644 --- a/source/blender/editors/sculpt_paint/paint_image.c +++ b/source/blender/editors/sculpt_paint/paint_image.c @@ -1132,7 +1132,7 @@ static int texture_paint_toggle_exec(bContext *C, wmOperator *op) BKE_paint_init(bmain, scene, ePaintTextureProjective, PAINT_CURSOR_TEXTURE_PAINT); - BKE_paint_toolslots_brush_validate(bmain, scene, &imapaint->paint); + BKE_paint_toolslots_brush_validate(bmain, &imapaint->paint); if (U.glreslimit != 0) GPU_free_images(bmain); diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c index 22695423bda..103cb6b5f2f 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.c +++ b/source/blender/editors/sculpt_paint/paint_vertex.c @@ -1249,7 +1249,7 @@ static int wpaint_mode_toggle_exec(bContext *C, wmOperator *op) Depsgraph *depsgraph = CTX_data_depsgraph_on_load(C); wmWindowManager *wm = CTX_wm_manager(C); ED_object_wpaintmode_enter_ex(bmain, depsgraph, wm, scene, ob); - BKE_paint_toolslots_brush_validate(bmain, scene, &ts->wpaint->paint); + BKE_paint_toolslots_brush_validate(bmain, &ts->wpaint->paint); } /* Weightpaint works by overriding colors in mesh, @@ -2395,7 +2395,7 @@ static int vpaint_mode_toggle_exec(bContext *C, wmOperator *op) Depsgraph *depsgraph = CTX_data_depsgraph_on_load(C); wmWindowManager *wm = CTX_wm_manager(C); ED_object_vpaintmode_enter_ex(bmain, depsgraph, wm, scene, ob); - BKE_paint_toolslots_brush_validate(bmain, scene, &ts->vpaint->paint); + BKE_paint_toolslots_brush_validate(bmain, &ts->vpaint->paint); } BKE_mesh_batch_cache_dirty_tag(ob->data, BKE_MESH_BATCH_DIRTY_ALL); diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index d5e629f205d..84e189a86bf 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -5835,7 +5835,7 @@ static int sculpt_mode_toggle_exec(bContext *C, wmOperator *op) } else { ED_object_sculptmode_enter_ex(bmain, depsgraph, scene, ob, op->reports); - BKE_paint_toolslots_brush_validate(bmain, scene, &ts->sculpt->paint); + BKE_paint_toolslots_brush_validate(bmain, &ts->sculpt->paint); } WM_event_add_notifier(C, NC_SCENE | ND_MODE, scene); |