blender/blender
170
528
Fork 806
Code Issues 6.6k Pull Requests 956 Projects 21 Wiki Activity

Fix #111490: paint radius set to 1 (shift-smoothing but brush missing) #111516

Merged
Philipp Oeser merged 5 commits from lichtwerk/blender:111490 into main 2023-08-29 13:44:42 +02:00
Conversation 7 Commits 5 Files Changed 2 +17 -24
2 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6fa104b306 - Show all commits

20
source/blender/editors/sculpt_paint/paint_vertex.cc
View File

@ -436,23 +436,18 @@ bool mode_toggle_poll_test(bContext *C)
void smooth_brush_toggle_off(const bContext *C, Paint *paint, StrokeCache *cache)
{
Main *bmain = CTX_data_main(C);
Scene *scene = CTX_data_scene(C);
Brush *brush = BKE_paint_brush(paint);
/* The current brush should match with what we have stored in the cache. */
BLI_assert(brush == cache->brush);
/* Note: used for both vertexpaint and weightpaint, VPAINT_TOOL_BLUR & WPAINT_TOOL_BLUR are the
* same, see comments for eBrushVertexPaintTool & eBrushWeightPaintTool. */
/* If the smooth (blur) brush is missing, brush was not switched/affected in
/* If saved_active_brush_name is not set, brush was not switched/affected in
* smooth_brush_toggle_on(). */
if (!BKE_paint_toolslots_brush_get(paint, WPAINT_TOOL_BLUR)) {
return;
}
BKE_brush_size_set(scene, brush, cache->saved_smooth_size);
brush = (Brush *)BKE_libblock_find_name(bmain, ID_BR, cache->saved_active_brush_name);
if (brush) {
BKE_paint_brush_set(paint, brush);
Brush *saved_active_brush = (Brush *)BKE_libblock_find_name(
bmain, ID_BR, cache->saved_active_brush_name);
if (saved_active_brush) {
Scene *scene = CTX_data_scene(C);
BKE_brush_size_set(scene, brush, cache->saved_smooth_size);
BKE_paint_brush_set(paint, saved_active_brush);
}
}
/* Initialize the stroke cache invariants from operator properties */
@ -606,6 +601,7 @@ void smooth_brush_toggle_on(const bContext *C, Paint *paint, StrokeCache *cache)
printf(
"WARNING: Switching to the blur (smooth) brush not possible, corresponding brush not "
"found\n");
cache->saved_active_brush_name[0] = '\0';
return;
}

21
source/blender/editors/sculpt_paint/sculpt.cc
View File

@ -4365,6 +4365,7 @@ static void smooth_brush_toggle_on(const bContext *C, Paint *paint, StrokeCache
Brush *smooth_brush = BKE_paint_toolslots_brush_get(paint, SCULPT_TOOL_SMOOTH);
if (!smooth_brush) {
printf("WARNING: Switching to the smooth brush not possible, corresponding brush not found\n");
cache->saved_active_brush_name[0] = '\0';
return;
}
@ -4381,7 +4382,6 @@ static void smooth_brush_toggle_on(const bContext *C, Paint *paint, StrokeCache
static void smooth_brush_toggle_off(const bContext *C, Paint *paint, StrokeCache *cache)
{
Main *bmain = CTX_data_main(C);
Scene *scene = CTX_data_scene(C);
Brush *brush = BKE_paint_brush(paint);
if (brush->sculpt_tool == SCULPT_TOOL_MASK) {
@ -4398,17 +4398,14 @@ static void smooth_brush_toggle_off(const bContext *C, Paint *paint, StrokeCache
/* Note: used for both vertexpaint and weightpaint, VPAINT_TOOL_BLUR & WPAINT_TOOL_BLUR are the
* same, see comments for eBrushVertexPaintTool & eBrushWeightPaintTool. */
/* If the smooth brush is missing, brush was not switched/affected in smooth_brush_toggle_on().
*/
if (!BKE_paint_toolslots_brush_get(paint, SCULPT_TOOL_SMOOTH)) {
return;
}
BKE_brush_size_set(scene, brush, cache->saved_smooth_size);
brush = (Brush *)BKE_libblock_find_name(bmain, ID_BR, cache->saved_active_brush_name);
if (brush) {
BKE_paint_brush_set(paint, brush);
/* If saved_active_brush_name is not set, brush was not switched/affected in
* smooth_brush_toggle_on(). */
Brush *saved_active_brush = (Brush *)BKE_libblock_find_name(
lichtwerk marked this conversation as resolved Outdated
Sergey Sharybin commented 2023-08-25 15:38:50 +02:00
Outdated
Review
Copy Link

It feels a bit redundant to be checking both BKE_paint_toolslots_brush_get(paint, SCULPT_TOOL_SMOOTH) and if (brush) {.

perhaps foo_on should clear saved_active_brush_name if the brush is not found, and here move BKE_brush_size_set(scene, brush, cache->saved_smooth_size); inside of the if (brush) {.

It feels a bit redundant to be checking both `BKE_paint_toolslots_brush_get(paint, SCULPT_TOOL_SMOOTH)` and `if (brush) {`. perhaps foo_on should clear `saved_active_brush_name` if the brush is not found, and here move `BKE_brush_size_set(scene, brush, cache->saved_smooth_size);` inside of the `if (brush) {`.
Philipp Oeser commented 2023-08-25 16:49:29 +02:00
Outdated
Review
Copy Link

done

done
bmain, ID_BR, cache->saved_active_brush_name);
if (saved_active_brush) {
Scene *scene = CTX_data_scene(C);
BKE_brush_size_set(scene, brush, cache->saved_smooth_size);
BKE_paint_brush_set(paint, saved_active_brush);
}
}