diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-07-05 23:25:34 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-05 23:25:34 +0300 |
commit | 0e2915b2929aa312a03bc4d3a606bb8073fcead0 (patch) | |
tree | 14802791f2cb342de20565a58e39684840da031a /source/blender/makesrna/intern/rna_brush.c | |
parent | 4d00e95ee3ed91f86262bb218f1c5df901da724c (diff) |
RNA: correct callback type
Missed when changing callbacks from int to bool type.
Diffstat (limited to 'source/blender/makesrna/intern/rna_brush.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_brush.c | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c index 71cdb24ffdc..bb204bf8c81 100644 --- a/source/blender/makesrna/intern/rna_brush.c +++ b/source/blender/makesrna/intern/rna_brush.c @@ -135,25 +135,25 @@ const EnumPropertyItem rna_enum_brush_image_tool_items[] = { #include "WM_api.h" -static int rna_SculptToolCapabilities_has_accumulate_get(PointerRNA *ptr) +static bool rna_SculptToolCapabilities_has_accumulate_get(PointerRNA *ptr) { Brush *br = (Brush *)ptr->data; return SCULPT_TOOL_HAS_ACCUMULATE(br->sculpt_tool); } -static int rna_SculptToolCapabilities_has_auto_smooth_get(PointerRNA *ptr) +static bool rna_SculptToolCapabilities_has_auto_smooth_get(PointerRNA *ptr) { Brush *br = (Brush *)ptr->data; return !ELEM(br->sculpt_tool, SCULPT_TOOL_MASK, SCULPT_TOOL_SMOOTH); } -static int rna_SculptToolCapabilities_has_height_get(PointerRNA *ptr) +static bool rna_SculptToolCapabilities_has_height_get(PointerRNA *ptr) { Brush *br = (Brush *)ptr->data; return br->sculpt_tool == SCULPT_TOOL_LAYER; } -static int rna_SculptToolCapabilities_has_jitter_get(PointerRNA *ptr) +static bool rna_SculptToolCapabilities_has_jitter_get(PointerRNA *ptr) { Brush *br = (Brush *)ptr->data; return (!(br->flag & BRUSH_ANCHORED) && @@ -163,19 +163,19 @@ static int rna_SculptToolCapabilities_has_jitter_get(PointerRNA *ptr) SCULPT_TOOL_SNAKE_HOOK, SCULPT_TOOL_THUMB)); } -static int rna_SculptToolCapabilities_has_normal_weight_get(PointerRNA *ptr) +static bool rna_SculptToolCapabilities_has_normal_weight_get(PointerRNA *ptr) { Brush *br = (Brush *)ptr->data; return SCULPT_TOOL_HAS_NORMAL_WEIGHT(br->sculpt_tool); } -static int rna_SculptToolCapabilities_has_rake_factor_get(PointerRNA *ptr) +static bool rna_SculptToolCapabilities_has_rake_factor_get(PointerRNA *ptr) { Brush *br = (Brush *)ptr->data; return SCULPT_TOOL_HAS_RAKE(br->sculpt_tool); } -static int rna_BrushCapabilities_has_overlay_get(PointerRNA *ptr) +static bool rna_BrushCapabilities_has_overlay_get(PointerRNA *ptr) { Brush *br = (Brush *)ptr->data; return ELEM(br->mtex.brush_map_mode, @@ -184,26 +184,26 @@ static int rna_BrushCapabilities_has_overlay_get(PointerRNA *ptr) MTEX_MAP_MODE_STENCIL); } -static int rna_SculptToolCapabilities_has_persistence_get(PointerRNA *ptr) +static bool rna_SculptToolCapabilities_has_persistence_get(PointerRNA *ptr) { Brush *br = (Brush *)ptr->data; return br->sculpt_tool == SCULPT_TOOL_LAYER; } -static int rna_SculptToolCapabilities_has_pinch_factor_get(PointerRNA *ptr) +static bool rna_SculptToolCapabilities_has_pinch_factor_get(PointerRNA *ptr) { Brush *br = (Brush *)ptr->data; return ELEM(br->sculpt_tool, SCULPT_TOOL_BLOB, SCULPT_TOOL_CREASE, SCULPT_TOOL_SNAKE_HOOK); } -static int rna_SculptToolCapabilities_has_plane_offset_get(PointerRNA *ptr) +static bool rna_SculptToolCapabilities_has_plane_offset_get(PointerRNA *ptr) { Brush *br = (Brush *)ptr->data; return ELEM(br->sculpt_tool, SCULPT_TOOL_CLAY, SCULPT_TOOL_CLAY_STRIPS, SCULPT_TOOL_FILL, SCULPT_TOOL_FLATTEN, SCULPT_TOOL_SCRAPE); } -static int rna_SculptToolCapabilities_has_random_texture_angle_get(PointerRNA *ptr) +static bool rna_SculptToolCapabilities_has_random_texture_angle_get(PointerRNA *ptr) { Brush *br = (Brush *)ptr->data; return (!ELEM(br->sculpt_tool, @@ -211,7 +211,7 @@ static int rna_SculptToolCapabilities_has_random_texture_angle_get(PointerRNA *p SCULPT_TOOL_SNAKE_HOOK, SCULPT_TOOL_THUMB)); } -static int rna_TextureCapabilities_has_random_texture_angle_get(PointerRNA *ptr) +static bool rna_TextureCapabilities_has_random_texture_angle_get(PointerRNA *ptr) { MTex *mtex = (MTex *)ptr->data; return ELEM(mtex->brush_map_mode, @@ -221,13 +221,13 @@ static int rna_TextureCapabilities_has_random_texture_angle_get(PointerRNA *ptr) } -static int rna_BrushCapabilities_has_random_texture_angle_get(PointerRNA *ptr) +static bool rna_BrushCapabilities_has_random_texture_angle_get(PointerRNA *ptr) { Brush *br = (Brush *)ptr->data; return !(br->flag & BRUSH_ANCHORED); } -static int rna_SculptToolCapabilities_has_sculpt_plane_get(PointerRNA *ptr) +static bool rna_SculptToolCapabilities_has_sculpt_plane_get(PointerRNA *ptr) { Brush *br = (Brush *)ptr->data; return !ELEM(br->sculpt_tool, SCULPT_TOOL_INFLATE, @@ -235,13 +235,13 @@ static int rna_SculptToolCapabilities_has_sculpt_plane_get(PointerRNA *ptr) SCULPT_TOOL_SMOOTH); } -static int rna_SculptToolCapabilities_has_secondary_color_get(PointerRNA *ptr) +static bool rna_SculptToolCapabilities_has_secondary_color_get(PointerRNA *ptr) { Brush *br = (Brush *)ptr->data; return BKE_brush_sculpt_has_secondary_color(br); } -static int rna_SculptToolCapabilities_has_smooth_stroke_get(PointerRNA *ptr) +static bool rna_SculptToolCapabilities_has_smooth_stroke_get(PointerRNA *ptr) { Brush *br = (Brush *)ptr->data; return (!(br->flag & BRUSH_ANCHORED) && @@ -253,7 +253,7 @@ static int rna_SculptToolCapabilities_has_smooth_stroke_get(PointerRNA *ptr) SCULPT_TOOL_SNAKE_HOOK, SCULPT_TOOL_THUMB)); } -static int rna_BrushCapabilities_has_smooth_stroke_get(PointerRNA *ptr) +static bool rna_BrushCapabilities_has_smooth_stroke_get(PointerRNA *ptr) { Brush *br = (Brush *)ptr->data; return (!(br->flag & BRUSH_ANCHORED) && @@ -262,7 +262,7 @@ static int rna_BrushCapabilities_has_smooth_stroke_get(PointerRNA *ptr) !(br->flag & BRUSH_CURVE)); } -static int rna_SculptToolCapabilities_has_space_attenuation_get(PointerRNA *ptr) +static bool rna_SculptToolCapabilities_has_space_attenuation_get(PointerRNA *ptr) { Brush *br = (Brush *)ptr->data; return ((br->flag & (BRUSH_SPACE | BRUSH_LINE | BRUSH_CURVE)) && @@ -270,38 +270,38 @@ static int rna_SculptToolCapabilities_has_space_attenuation_get(PointerRNA *ptr) SCULPT_TOOL_SMOOTH, SCULPT_TOOL_SNAKE_HOOK)); } -static int rna_ImapaintToolCapabilities_has_space_attenuation_get(PointerRNA *ptr) +static bool rna_ImapaintToolCapabilities_has_space_attenuation_get(PointerRNA *ptr) { Brush *br = (Brush *)ptr->data; return (br->flag & (BRUSH_SPACE | BRUSH_LINE | BRUSH_CURVE)) && br->imagepaint_tool != PAINT_TOOL_FILL; } -static int rna_BrushCapabilities_has_spacing_get(PointerRNA *ptr) +static bool rna_BrushCapabilities_has_spacing_get(PointerRNA *ptr) { Brush *br = (Brush *)ptr->data; return (!(br->flag & BRUSH_ANCHORED)); } -static int rna_SculptToolCapabilities_has_strength_pressure_get(PointerRNA *ptr) +static bool rna_SculptToolCapabilities_has_strength_pressure_get(PointerRNA *ptr) { Brush *br = (Brush *)ptr->data; return !ELEM(br->sculpt_tool, SCULPT_TOOL_GRAB, SCULPT_TOOL_SNAKE_HOOK); } -static int rna_TextureCapabilities_has_texture_angle_get(PointerRNA *ptr) +static bool rna_TextureCapabilities_has_texture_angle_get(PointerRNA *ptr) { MTex *mtex = (MTex *)ptr->data; return mtex->brush_map_mode != MTEX_MAP_MODE_3D; } -static int rna_SculptToolCapabilities_has_gravity_get(PointerRNA *ptr) +static bool rna_SculptToolCapabilities_has_gravity_get(PointerRNA *ptr) { Brush *br = (Brush *)ptr->data; return !ELEM(br->sculpt_tool, SCULPT_TOOL_MASK, SCULPT_TOOL_SMOOTH); } -static int rna_TextureCapabilities_has_texture_angle_source_get(PointerRNA *ptr) +static bool rna_TextureCapabilities_has_texture_angle_source_get(PointerRNA *ptr) { MTex *mtex = (MTex *)ptr->data; return ELEM(mtex->brush_map_mode, @@ -310,7 +310,7 @@ static int rna_TextureCapabilities_has_texture_angle_source_get(PointerRNA *ptr) MTEX_MAP_MODE_RANDOM); } -static int rna_ImapaintToolCapabilities_has_accumulate_get(PointerRNA *ptr) +static bool rna_ImapaintToolCapabilities_has_accumulate_get(PointerRNA *ptr) { /* only support for draw tool */ Brush *br = (Brush *)ptr->data; @@ -325,7 +325,7 @@ static int rna_ImapaintToolCapabilities_has_accumulate_get(PointerRNA *ptr) ) ? false : true; } -static int rna_ImapaintToolCapabilities_has_radius_get(PointerRNA *ptr) +static bool rna_ImapaintToolCapabilities_has_radius_get(PointerRNA *ptr) { /* only support for draw tool */ Brush *br = (Brush *)ptr->data; @@ -456,7 +456,7 @@ static void rna_Brush_set_size(PointerRNA *ptr, int value) brush->size = value; } -static void rna_Brush_use_gradient_set(PointerRNA *ptr, int value) +static void rna_Brush_use_gradient_set(PointerRNA *ptr, bool value) { Brush *br = (Brush *)ptr->data; |