Fix incorrect brush falloff flag use
Harmless currently since they're the same value, would fail if other options were added.
This commit is contained in:
parent
879d269e87
commit
695cbf5eef
@ -1359,13 +1359,14 @@ static void paint_draw_cursor(bContext *C, int x, int y, void *UNUSED(unused))
|
|||||||
if ((mode == PAINT_MODE_SCULPT) && ss && !ups->stroke_active) {
|
if ((mode == PAINT_MODE_SCULPT) && ss && !ups->stroke_active) {
|
||||||
prev_active_vertex_index = ss->active_vertex_index;
|
prev_active_vertex_index = ss->active_vertex_index;
|
||||||
is_cursor_over_mesh = sculpt_cursor_geometry_info_update(
|
is_cursor_over_mesh = sculpt_cursor_geometry_info_update(
|
||||||
C, &gi, mouse, !(brush->falloff_shape & BRUSH_AIRBRUSH));
|
C, &gi, mouse, (brush->falloff_shape == PAINT_FALLOFF_SHAPE_SPHERE));
|
||||||
}
|
}
|
||||||
/* Use special paint crosshair cursor in all paint modes*/
|
/* Use special paint crosshair cursor in all paint modes*/
|
||||||
wmWindow *win = CTX_wm_window(C);
|
wmWindow *win = CTX_wm_window(C);
|
||||||
WM_cursor_set(win, WM_CURSOR_PAINT);
|
WM_cursor_set(win, WM_CURSOR_PAINT);
|
||||||
|
|
||||||
if ((mode == PAINT_MODE_SCULPT) && ss && !(brush->falloff_shape & BRUSH_AIRBRUSH)) {
|
if ((mode == PAINT_MODE_SCULPT) && ss &&
|
||||||
|
(brush->falloff_shape == PAINT_FALLOFF_SHAPE_SPHERE)) {
|
||||||
Sculpt *sd = CTX_data_tool_settings(C)->sculpt;
|
Sculpt *sd = CTX_data_tool_settings(C)->sculpt;
|
||||||
|
|
||||||
if (!ups->stroke_active) {
|
if (!ups->stroke_active) {
|
||||||
|
@ -1248,7 +1248,7 @@ static void sculpt_automasking_end(Object *ob)
|
|||||||
static bool sculpt_automasking_is_constrained_by_radius(Brush *br)
|
static bool sculpt_automasking_is_constrained_by_radius(Brush *br)
|
||||||
{
|
{
|
||||||
/* 2D falloff is not constrained by radius */
|
/* 2D falloff is not constrained by radius */
|
||||||
if (br->falloff_shape & BRUSH_AIRBRUSH) {
|
if (br->falloff_shape == PAINT_FALLOFF_SHAPE_TUBE) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1959,7 +1959,7 @@ static void rna_def_brush(BlenderRNA *brna)
|
|||||||
/* flag */
|
/* flag */
|
||||||
/* This is an enum but its unlikely we add other shapes, so expose as a boolean. */
|
/* This is an enum but its unlikely we add other shapes, so expose as a boolean. */
|
||||||
prop = RNA_def_property(srna, "use_projected", PROP_BOOLEAN, PROP_NONE);
|
prop = RNA_def_property(srna, "use_projected", PROP_BOOLEAN, PROP_NONE);
|
||||||
RNA_def_property_boolean_sdna(prop, NULL, "falloff_shape", BRUSH_AIRBRUSH);
|
RNA_def_property_boolean_sdna(prop, NULL, "falloff_shape", PAINT_FALLOFF_SHAPE_TUBE);
|
||||||
RNA_def_property_ui_text(
|
RNA_def_property_ui_text(
|
||||||
prop, "2D Falloff", "Apply brush influence in 2D circle instead of a sphere");
|
prop, "2D Falloff", "Apply brush influence in 2D circle instead of a sphere");
|
||||||
RNA_def_property_update(prop, 0, "rna_Brush_update");
|
RNA_def_property_update(prop, 0, "rna_Brush_update");
|
||||||
|
Loading…
Reference in New Issue
Block a user