blender/blender
147
472
Fork 689
Code Issues 6.7k Pull Requests 888 Projects 18 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 +63 -41
2 changed files with 63 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,6 +13,8 @@
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
#include "CLG_log.h"
#include "BLI_array_utils.h" #include "BLI_array_utils.h"
#include "BLI_color.hh" #include "BLI_color.hh"
#include "BLI_color_mix.hh" #include "BLI_color_mix.hh"
@ -76,6 +78,8 @@ using namespace blender::color;
using namespace blender::ed::sculpt_paint; /* For vwpaint namespace. */ using namespace blender::ed::sculpt_paint; /* For vwpaint namespace. */
using blender::ed::sculpt_paint::vwpaint::NormalAnglePrecalc; using blender::ed::sculpt_paint::vwpaint::NormalAnglePrecalc;
static CLG_LogRef LOG = {"ed.sculpt_paint"};
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
/** \name Internal Utilities /** \name Internal Utilities
* \{ */ * \{ */
@ -436,16 +440,18 @@ bool mode_toggle_poll_test(bContext *C)
void smooth_brush_toggle_off(const bContext *C, Paint *paint, StrokeCache *cache) void smooth_brush_toggle_off(const bContext *C, Paint *paint, StrokeCache *cache)
{ {
Main *bmain = CTX_data_main(C); Main *bmain = CTX_data_main(C);
Scene *scene = CTX_data_scene(C);
Brush *brush = BKE_paint_brush(paint); Brush *brush = BKE_paint_brush(paint);
/* The current brush should match with what we have stored in the cache. */ /* The current brush should match with what we have stored in the cache. */
BLI_assert(brush == cache->brush); BLI_assert(brush == cache->brush);
/* Try to switch back to the saved/previous brush. */ /* If saved_active_brush_name is not set, brush was not switched/affected in
BKE_brush_size_set(scene, brush, cache->saved_smooth_size); * smooth_brush_toggle_on(). */
brush = (Brush *)BKE_libblock_find_name(bmain, ID_BR, cache->saved_active_brush_name); Brush *saved_active_brush = (Brush *)BKE_libblock_find_name(
if (brush) { bmain, ID_BR, cache->saved_active_brush_name);
BKE_paint_brush_set(paint, brush); 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 */ /* Initialize the stroke cache invariants from operator properties */
@ -590,19 +596,26 @@ void last_stroke_update(Scene *scene, const float location[3])
void smooth_brush_toggle_on(const bContext *C, Paint *paint, StrokeCache *cache) void smooth_brush_toggle_on(const bContext *C, Paint *paint, StrokeCache *cache)
{ {
Scene *scene = CTX_data_scene(C); Scene *scene = CTX_data_scene(C);
Brush *brush = paint->brush;
int cur_brush_size = BKE_brush_size_get(scene, brush);
STRNCPY(cache->saved_active_brush_name, brush->id.name + 2); /* Switch to the blur (smooth) brush if possible. */
/* Note: used for both vertexpaint and weightpaint, VPAINT_TOOL_BLUR & WPAINT_TOOL_BLUR are the
/* Switch to the blur (smooth) brush. */ * same, see comments for eBrushVertexPaintTool & eBrushWeightPaintTool. */
brush = BKE_paint_toolslots_brush_get(paint, WPAINT_TOOL_BLUR); Brush *smooth_brush = BKE_paint_toolslots_brush_get(paint, WPAINT_TOOL_BLUR);
if (brush) { if (!smooth_brush) {
BKE_paint_brush_set(paint, brush); CLOG_WARN(&LOG, "Switching to the blur (smooth) brush not possible, corresponding brush not");
cache->saved_smooth_size = BKE_brush_size_get(scene, brush); cache->saved_active_brush_name[0] = '\0';
BKE_brush_size_set(scene, brush, cur_brush_size); return;
BKE_curvemapping_init(brush->curve);
} }
Brush *cur_brush = paint->brush;
int cur_brush_size = BKE_brush_size_get(scene, cur_brush);
STRNCPY(cache->saved_active_brush_name, cur_brush->id.name + 2);
BKE_paint_brush_set(paint, smooth_brush);
cache->saved_smooth_size = BKE_brush_size_get(scene, smooth_brush);
BKE_brush_size_set(scene, smooth_brush, cur_brush_size);
BKE_curvemapping_init(smooth_brush->curve);
} }
/** \} */ /** \} */
} // namespace blender::ed::sculpt_paint::vwpaint } // namespace blender::ed::sculpt_paint::vwpaint

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

@ -13,6 +13,8 @@
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
#include "CLG_log.h"
#include "BLI_array_utils.hh" #include "BLI_array_utils.hh"
#include "BLI_blenlib.h" #include "BLI_blenlib.h"
#include "BLI_dial_2d.h" #include "BLI_dial_2d.h"
@ -85,6 +87,8 @@ using blender::Set;
using blender::Span; using blender::Span;
using blender::Vector; using blender::Vector;
static CLG_LogRef LOG = {"ed.sculpt_paint"};
static float sculpt_calc_radius(ViewContext *vc, static float sculpt_calc_radius(ViewContext *vc,
const Brush *brush, const Brush *brush,
const Scene *scene, const Scene *scene,
@ -4299,40 +4303,43 @@ static void sculpt_init_mirror_clipping(Object *ob, SculptSession *ss)
static void smooth_brush_toggle_on(const bContext *C, Paint *paint, StrokeCache *cache) static void smooth_brush_toggle_on(const bContext *C, Paint *paint, StrokeCache *cache)
{ {
Scene *scene = CTX_data_scene(C); Scene *scene = CTX_data_scene(C);
Brush *brush = paint->brush; Brush *cur_brush = paint->brush;
if (brush->sculpt_tool == SCULPT_TOOL_MASK) { if (cur_brush->sculpt_tool == SCULPT_TOOL_MASK) {
cache->saved_mask_brush_tool = brush->mask_tool; cache->saved_mask_brush_tool = cur_brush->mask_tool;
brush->mask_tool = BRUSH_MASK_SMOOTH; cur_brush->mask_tool = BRUSH_MASK_SMOOTH;
} }
else if (ELEM(brush->sculpt_tool, else if (ELEM(cur_brush->sculpt_tool,
SCULPT_TOOL_SLIDE_RELAX, SCULPT_TOOL_SLIDE_RELAX,
SCULPT_TOOL_DRAW_FACE_SETS, SCULPT_TOOL_DRAW_FACE_SETS,
SCULPT_TOOL_PAINT, SCULPT_TOOL_PAINT,
SCULPT_TOOL_SMEAR)) SCULPT_TOOL_SMEAR))
{ {
/* Do nothing, this tool has its own smooth mode. */ /* Do nothing, this tool has its own smooth mode. */
return;
} }
else {
int cur_brush_size = BKE_brush_size_get(scene, brush);
STRNCPY(cache->saved_active_brush_name, brush->id.name + 2); /* Switch to the smooth brush if possible. */
Brush *smooth_brush = BKE_paint_toolslots_brush_get(paint, SCULPT_TOOL_SMOOTH);
/* Switch to the smooth brush. */ if (!smooth_brush) {
brush = BKE_paint_toolslots_brush_get(paint, SCULPT_TOOL_SMOOTH); CLOG_WARN(&LOG, "Switching to the smooth brush not possible, corresponding brush not");
if (brush) { cache->saved_active_brush_name[0] = '\0';
BKE_paint_brush_set(paint, brush); return;
cache->saved_smooth_size = BKE_brush_size_get(scene, brush);
BKE_brush_size_set(scene, brush, cur_brush_size);
BKE_curvemapping_init(brush->curve);
}
} }
int cur_brush_size = BKE_brush_size_get(scene, cur_brush);
STRNCPY(cache->saved_active_brush_name, cur_brush->id.name + 2);
BKE_paint_brush_set(paint, smooth_brush);
cache->saved_smooth_size = BKE_brush_size_get(scene, smooth_brush);
BKE_brush_size_set(scene, smooth_brush, cur_brush_size);
BKE_curvemapping_init(smooth_brush->curve);
} }
static void smooth_brush_toggle_off(const bContext *C, Paint *paint, StrokeCache *cache) static void smooth_brush_toggle_off(const bContext *C, Paint *paint, StrokeCache *cache)
{ {
Main *bmain = CTX_data_main(C); Main *bmain = CTX_data_main(C);
Scene *scene = CTX_data_scene(C);
Brush *brush = BKE_paint_brush(paint); Brush *brush = BKE_paint_brush(paint);
if (brush->sculpt_tool == SCULPT_TOOL_MASK) { if (brush->sculpt_tool == SCULPT_TOOL_MASK) {
@ -4346,13 +4353,15 @@ static void smooth_brush_toggle_off(const bContext *C, Paint *paint, StrokeCache
{ {
/* Do nothing. */ /* Do nothing. */
} }
else {
/* Try to switch back to the saved/previous 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(
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_brush_size_set(scene, brush, cache->saved_smooth_size);
brush = (Brush *)BKE_libblock_find_name(bmain, ID_BR, cache->saved_active_brush_name); BKE_paint_brush_set(paint, saved_active_brush);
if (brush) {
BKE_paint_brush_set(paint, brush);
}
} }
} }