diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2019-03-31 17:48:39 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2019-03-31 17:52:23 +0300 |
commit | 54943e319ad89c0b4aff6320ecbd955338ea8948 (patch) | |
tree | 8ba4212e09c9ef4aa871603f0133ef8fecf6caa0 /source/blender/makesrna/intern/rna_sculpt_paint.c | |
parent | 700346d377dd288ededc20b636162e28496fa84c (diff) |
Fix/Cleanup bad usage of RNA_def_parameter_clear_flags() on RNA properties.
Diffstat (limited to 'source/blender/makesrna/intern/rna_sculpt_paint.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_sculpt_paint.c | 69 |
1 files changed, 34 insertions, 35 deletions
diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c b/source/blender/makesrna/intern/rna_sculpt_paint.c index 921c6753575..6d805639940 100644 --- a/source/blender/makesrna/intern/rna_sculpt_paint.c +++ b/source/blender/makesrna/intern/rna_sculpt_paint.c @@ -1219,14 +1219,14 @@ static void rna_def_gpencil_guides(BlenderRNA *brna) RNA_def_property_boolean_sdna(prop, NULL, "use_guide", false); RNA_def_property_boolean_default(prop, false); RNA_def_property_ui_text(prop, "Use Guides", "Enable speed guides"); - RNA_def_parameter_clear_flags(prop, PROP_ANIMATABLE, 0); + RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); prop = RNA_def_property(srna, "use_snapping", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "use_snapping", false); RNA_def_property_boolean_default(prop, false); RNA_def_property_ui_text(prop, "Use Snapping", "Enable snapping to guides angle or spacing options"); - RNA_def_parameter_clear_flags(prop, PROP_ANIMATABLE, 0); + RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); prop = RNA_def_property(srna, "reference_object", PROP_POINTER, PROP_NONE); @@ -1239,28 +1239,28 @@ static void rna_def_gpencil_guides(BlenderRNA *brna) RNA_def_property_enum_sdna(prop, NULL, "reference_point"); RNA_def_property_enum_items(prop, prop_gpencil_guide_references); RNA_def_property_ui_text(prop, "Type", "Type of speed guide"); - RNA_def_parameter_clear_flags(prop, PROP_ANIMATABLE, 0); + RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, "rna_ImaPaint_viewport_update"); prop = RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "type"); RNA_def_property_enum_items(prop, prop_gpencil_guidetypes); RNA_def_property_ui_text(prop, "Type", "Type of speed guide"); - RNA_def_parameter_clear_flags(prop, PROP_ANIMATABLE, 0); + RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); prop = RNA_def_property(srna, "angle", PROP_FLOAT, PROP_ANGLE); RNA_def_property_float_sdna(prop, NULL, "angle"); RNA_def_property_range(prop, -(M_PI * 2.0f), (M_PI * 2.0f)); RNA_def_property_ui_text(prop, "Angle", "Direction of lines"); - RNA_def_parameter_clear_flags(prop, PROP_ANIMATABLE, 0); + RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); prop = RNA_def_property(srna, "angle_snap", PROP_FLOAT, PROP_ANGLE); RNA_def_property_float_sdna(prop, NULL, "angle_snap"); RNA_def_property_range(prop, -(M_PI * 2.0f), (M_PI * 2.0f)); RNA_def_property_ui_text(prop, "Angle Snap", "Angle snapping"); - RNA_def_parameter_clear_flags(prop, PROP_ANIMATABLE, 0); + RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); prop = RNA_def_property(srna, "spacing", PROP_FLOAT, PROP_DISTANCE); @@ -1269,13 +1269,13 @@ static void rna_def_gpencil_guides(BlenderRNA *brna) RNA_def_property_range(prop, 0.0f, FLT_MAX); RNA_def_property_ui_range(prop, 0.0f, FLT_MAX, 1, 3); RNA_def_property_ui_text(prop, "Spacing", "Guide spacing"); - RNA_def_parameter_clear_flags(prop, PROP_ANIMATABLE, 0); + RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); prop = RNA_def_property(srna, "location", PROP_FLOAT, PROP_DISTANCE); RNA_def_property_float_sdna(prop, NULL, "location"); RNA_def_property_array(prop, 3); - RNA_def_parameter_clear_flags(prop, PROP_ANIMATABLE, 0); + RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_ui_text(prop, "Location", "Custom reference point for guides"); RNA_def_property_range(prop, -FLT_MAX, FLT_MAX); RNA_def_property_ui_range(prop, -FLT_MAX, FLT_MAX, 1, 3); @@ -1303,68 +1303,68 @@ static void rna_def_gpencil_sculpt(BlenderRNA *brna) RNA_def_property_enum_sdna(prop, NULL, "brushtype"); RNA_def_property_enum_items(prop, rna_enum_gpencil_sculpt_brush_items); RNA_def_property_ui_text(prop, "Tool", ""); - RNA_def_parameter_clear_flags(prop, PROP_ANIMATABLE, 0); + RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, "rna_GPencil_update"); prop = RNA_def_property(srna, "weight_tool", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "weighttype"); RNA_def_property_enum_items(prop, rna_enum_gpencil_weight_brush_items); RNA_def_property_ui_text(prop, "Tool", "Tool for weight painting"); - RNA_def_parameter_clear_flags(prop, PROP_ANIMATABLE, 0); + RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, "rna_GPencil_update"); prop = RNA_def_property(srna, "brush", PROP_POINTER, PROP_NONE); RNA_def_property_struct_type(prop, "GPencilSculptBrush"); RNA_def_property_pointer_funcs(prop, "rna_GPencilSculptSettings_brush_get", NULL, NULL, NULL); - RNA_def_parameter_clear_flags(prop, PROP_ANIMATABLE, 0); + RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_ui_text(prop, "Brush", ""); prop = RNA_def_property(srna, "guide", PROP_POINTER, PROP_NONE); RNA_def_property_struct_type(prop, "GPencilSculptGuide"); - RNA_def_parameter_clear_flags(prop, PROP_ANIMATABLE, 0); + RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_ui_text(prop, "Guide", ""); prop = RNA_def_property(srna, "use_select_mask", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_SCULPT_SETT_FLAG_SELECT_MASK); RNA_def_property_ui_text(prop, "Selection Mask", "Only sculpt selected stroke points"); RNA_def_property_ui_icon(prop, ICON_GP_ONLY_SELECTED, 0); - RNA_def_parameter_clear_flags(prop, PROP_ANIMATABLE, 0); + RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); prop = RNA_def_property(srna, "use_edit_position", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_SCULPT_SETT_FLAG_APPLY_POSITION); RNA_def_property_ui_text(prop, "Affect Position", "The brush affects the position of the point"); - RNA_def_parameter_clear_flags(prop, PROP_ANIMATABLE, 0); + RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); prop = RNA_def_property(srna, "use_edit_strength", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_SCULPT_SETT_FLAG_APPLY_STRENGTH); RNA_def_property_ui_text(prop, "Affect Strength", "The brush affects the color strength of the point"); - RNA_def_parameter_clear_flags(prop, PROP_ANIMATABLE, 0); + RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); prop = RNA_def_property(srna, "use_edit_thickness", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_SCULPT_SETT_FLAG_APPLY_THICKNESS); RNA_def_property_ui_text(prop, "Affect Thickness", "The brush affects the thickness of the point"); - RNA_def_parameter_clear_flags(prop, PROP_ANIMATABLE, 0); + RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); prop = RNA_def_property(srna, "use_edit_uv", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_SCULPT_SETT_FLAG_APPLY_UV); RNA_def_property_ui_text(prop, "Affect UV", "The brush affects the UV rotation of the point"); - RNA_def_parameter_clear_flags(prop, PROP_ANIMATABLE, 0); + RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); prop = RNA_def_property(srna, "use_multiframe_falloff", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_SCULPT_SETT_FLAG_FRAME_FALLOFF); RNA_def_property_ui_text(prop, "Use Falloff", "Use falloff effect when edit in multiframe mode to compute brush effect by frame"); - RNA_def_parameter_clear_flags(prop, PROP_ANIMATABLE, 0); + RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); prop = RNA_def_property(srna, "use_thickness_curve", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_SCULPT_SETT_FLAG_PRIMITIVE_CURVE); RNA_def_property_ui_text(prop, "Use Curve", "Use curve to define primitive stroke thickness"); - RNA_def_parameter_clear_flags(prop, PROP_ANIMATABLE, 0); + RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); /* custom falloff curve */ @@ -1374,7 +1374,7 @@ static void rna_def_gpencil_sculpt(BlenderRNA *brna) RNA_def_property_ui_text( prop, "Curve", "Custom curve to control falloff of brush effect by Grease Pencil frames"); - RNA_def_parameter_clear_flags(prop, PROP_ANIMATABLE, 0); + RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); /* custom primitive curve */ @@ -1384,7 +1384,7 @@ static void rna_def_gpencil_sculpt(BlenderRNA *brna) RNA_def_property_ui_text( prop, "Curve", "Custom curve to control primitive thickness"); - RNA_def_parameter_clear_flags(prop, PROP_ANIMATABLE, 0); + RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); /* lock axis */ @@ -1392,7 +1392,7 @@ static void rna_def_gpencil_sculpt(BlenderRNA *brna) RNA_def_property_enum_sdna(prop, NULL, "lock_axis"); RNA_def_property_enum_items(prop, rna_enum_gpencil_lock_axis_items); RNA_def_property_ui_text(prop, "Lock Axis", ""); - RNA_def_parameter_clear_flags(prop, PROP_ANIMATABLE, 0); + RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update"); /* threshold for cutter */ @@ -1401,65 +1401,64 @@ static void rna_def_gpencil_sculpt(BlenderRNA *brna) RNA_def_property_range(prop, 0.0f, 10.0f); RNA_def_property_float_default(prop, 0.1f); RNA_def_property_ui_text(prop, "Threshold", "Threshold for stroke intersections"); - RNA_def_parameter_clear_flags(prop, PROP_ANIMATABLE, 0); + RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); /* brush */ srna = RNA_def_struct(brna, "GPencilSculptBrush", NULL); RNA_def_struct_sdna(srna, "GP_Sculpt_Data"); RNA_def_struct_path_func(srna, "rna_GPencilSculptBrush_path"); RNA_def_struct_ui_text(srna, "GPencil Sculpt Brush", "Stroke editing brush"); - RNA_def_parameter_clear_flags(prop, PROP_ANIMATABLE, 0); prop = RNA_def_property(srna, "size", PROP_INT, PROP_PIXEL); RNA_def_property_range(prop, 1, GP_MAX_BRUSH_PIXEL_RADIUS); RNA_def_property_ui_range(prop, 1, 500, 10, 3); RNA_def_property_ui_text(prop, "Radius", "Radius of the brush in pixels"); - RNA_def_parameter_clear_flags(prop, PROP_ANIMATABLE, 0); + RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); prop = RNA_def_property(srna, "strength", PROP_FLOAT, PROP_FACTOR); RNA_def_property_range(prop, 0.001, 1.0); RNA_def_property_ui_text(prop, "Strength", "Brush strength"); - RNA_def_parameter_clear_flags(prop, PROP_ANIMATABLE, 0); + RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); prop = RNA_def_property(srna, "weight", PROP_FLOAT, PROP_FACTOR); RNA_def_property_range(prop, 0.0, 1.0); RNA_def_property_ui_text(prop, "Weight", "Target weight"); - RNA_def_parameter_clear_flags(prop, PROP_ANIMATABLE, 0); + RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); prop = RNA_def_property(srna, "use_pressure_strength", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_SCULPT_FLAG_USE_PRESSURE); RNA_def_property_ui_icon(prop, ICON_STYLUS_PRESSURE, 0); RNA_def_property_ui_text(prop, "Strength Pressure", "Enable tablet pressure sensitivity for strength"); - RNA_def_parameter_clear_flags(prop, PROP_ANIMATABLE, 0); + RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); prop = RNA_def_property(srna, "use_pressure_radius", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_SCULPT_FLAG_PRESSURE_RADIUS); RNA_def_property_ui_icon(prop, ICON_STYLUS_PRESSURE, 0); RNA_def_property_ui_text(prop, "Radius Pressure", "Enable tablet pressure sensitivity for radius"); - RNA_def_parameter_clear_flags(prop, PROP_ANIMATABLE, 0); + RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); prop = RNA_def_property(srna, "use_falloff", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_SCULPT_FLAG_USE_FALLOFF); RNA_def_property_ui_text(prop, "Use Falloff", "Strength of brush decays with distance from cursor"); - RNA_def_parameter_clear_flags(prop, PROP_ANIMATABLE, 0); + RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); prop = RNA_def_property(srna, "use_edit_pressure", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_SCULPT_FLAG_SMOOTH_PRESSURE); RNA_def_property_ui_text(prop, "Affect Pressure", "Affect pressure values as well when smoothing strokes"); - RNA_def_parameter_clear_flags(prop, PROP_ANIMATABLE, 0); + RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); prop = RNA_def_property(srna, "direction", PROP_ENUM, PROP_NONE); RNA_def_property_enum_bitflag_sdna(prop, NULL, "flag"); RNA_def_property_enum_items(prop, prop_direction_items); RNA_def_property_ui_text(prop, "Direction", ""); - RNA_def_parameter_clear_flags(prop, PROP_ANIMATABLE, 0); + RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); /* Cursor Color */ @@ -1472,7 +1471,7 @@ static void rna_def_gpencil_sculpt(BlenderRNA *brna) RNA_def_property_range(prop, 0.0f, 1.0f); RNA_def_property_float_array_default(prop, default_1); RNA_def_property_ui_text(prop, "Cursor Add", "Color for the cursor for addition"); - RNA_def_parameter_clear_flags(prop, PROP_ANIMATABLE, 0); + RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); prop = RNA_def_property(srna, "cursor_color_sub", PROP_FLOAT, PROP_COLOR_GAMMA); RNA_def_property_float_sdna(prop, NULL, "curcolor_sub"); @@ -1480,13 +1479,13 @@ static void rna_def_gpencil_sculpt(BlenderRNA *brna) RNA_def_property_range(prop, 0.0f, 1.0f); RNA_def_property_float_array_default(prop, default_2); RNA_def_property_ui_text(prop, "Cursor Sub", "Color for the cursor for subtraction"); - RNA_def_parameter_clear_flags(prop, PROP_ANIMATABLE, 0); + RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); prop = RNA_def_property(srna, "use_cursor", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_SCULPT_FLAG_ENABLE_CURSOR); RNA_def_property_boolean_default(prop, true); RNA_def_property_ui_text(prop, "Enable Cursor", "Enable cursor on screen"); - RNA_def_parameter_clear_flags(prop, PROP_ANIMATABLE, 0); + RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); } void RNA_def_sculpt_paint(BlenderRNA *brna) |