[Bf-blender-cvs] [695cbf5eef7] blender-v2.81-release: Fix incorrect brush falloff flag use

[Campbell Barton]

Commit: 695cbf5eef793e513a3e90c56d1b17692648d2a2
Author: Campbell Barton
Date:   Tue Oct 15 09:54:41 2019 +1100
Branches: blender-v2.81-release
https://developer.blender.org/rB695cbf5eef793e513a3e90c56d1b17692648d2a2

Fix incorrect brush falloff flag use

Harmless currently since they're the same value,
would fail if other options were added.

===================================================================

M	source/blender/editors/sculpt_paint/paint_cursor.c
M	source/blender/editors/sculpt_paint/sculpt.c
M	source/blender/makesrna/intern/rna_brush.c

===================================================================

diff --git a/source/blender/editors/sculpt_paint/paint_cursor.c b/source/blender/editors/sculpt_paint/paint_cursor.c
index e8c03d398c4..c59ab6279cd 100644
--- a/source/blender/editors/sculpt_paint/paint_cursor.c
+++ b/source/blender/editors/sculpt_paint/paint_cursor.c
@@ -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) {
       prev_active_vertex_index = ss->active_vertex_index;
       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*/
     wmWindow *win = CTX_wm_window(C);
     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;
 
       if (!ups->stroke_active) {
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index 2bde42c739c..d2d424745da 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -1248,7 +1248,7 @@ static void sculpt_automasking_end(Object *ob)
 static bool sculpt_automasking_is_constrained_by_radius(Brush *br)
 {
   /* 2D falloff is not constrained by radius */
-  if (br->falloff_shape & BRUSH_AIRBRUSH) {
+  if (br->falloff_shape == PAINT_FALLOFF_SHAPE_TUBE) {
     return false;
   }
 
diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c
index 2aaa9e7855e..57a3d889437 100644
--- a/source/blender/makesrna/intern/rna_brush.c
+++ b/source/blender/makesrna/intern/rna_brush.c
@@ -1959,7 +1959,7 @@ static void rna_def_brush(BlenderRNA *brna)
   /* flag */
   /* 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);
-  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(
       prop, "2D Falloff", "Apply brush influence in 2D circle instead of a sphere");
   RNA_def_property_update(prop, 0, "rna_Brush_update");