diff --git a/scripts/startup/bl_ui/space_image.py b/scripts/startup/bl_ui/space_image.py index c88de9d1b2c..5b7564cc081 100644 --- a/scripts/startup/bl_ui/space_image.py +++ b/scripts/startup/bl_ui/space_image.py @@ -1415,7 +1415,7 @@ class IMAGE_PT_uv_sculpt_curve(Panel): if props.curve_distance_falloff_preset == 'CUSTOM': col = layout.column() - col.template_curve_mapping(props, "strength_curve") + col.template_curve_mapping(props, "curve_distance_falloff") # Only a popover. diff --git a/source/blender/blenkernel/intern/scene.cc b/source/blender/blenkernel/intern/scene.cc index 298e2a97fa1..51533d22179 100644 --- a/source/blender/blenkernel/intern/scene.cc +++ b/source/blender/blenkernel/intern/scene.cc @@ -1076,8 +1076,8 @@ static void scene_blend_write(BlendWriter *writer, ID *id, const void *id_addres BKE_paint_blend_write(writer, &ts->sculpt->paint); } - if (ts->uvsculpt.strength_curve) { - BKE_curvemapping_blend_write(writer, ts->uvsculpt.strength_curve); + if (ts->uvsculpt.curve_distance_falloff) { + BKE_curvemapping_blend_write(writer, ts->uvsculpt.curve_distance_falloff); } if (ts->gp_paint) { BLO_write_struct(writer, GpPaint, ts->gp_paint); @@ -1288,10 +1288,10 @@ static void scene_blend_read_data(BlendDataReader *reader, ID *id) sce->toolsettings->particle.scene = nullptr; sce->toolsettings->particle.object = nullptr; sce->toolsettings->gp_sculpt.paintcursor = nullptr; - if (sce->toolsettings->uvsculpt.strength_curve) { - BLO_read_struct(reader, CurveMapping, &sce->toolsettings->uvsculpt.strength_curve); - BKE_curvemapping_blend_read(reader, sce->toolsettings->uvsculpt.strength_curve); - BKE_curvemapping_init(sce->toolsettings->uvsculpt.strength_curve); + if (sce->toolsettings->uvsculpt.curve_distance_falloff) { + BLO_read_struct(reader, CurveMapping, &sce->toolsettings->uvsculpt.curve_distance_falloff); + BKE_curvemapping_blend_read(reader, sce->toolsettings->uvsculpt.curve_distance_falloff); + BKE_curvemapping_init(sce->toolsettings->uvsculpt.curve_distance_falloff); } if (sce->toolsettings->sculpt) { @@ -1628,9 +1628,10 @@ ToolSettings *BKE_toolsettings_copy(ToolSettings *toolsettings, const int flag) BKE_curvemapping_init(ts->sculpt->automasking_cavity_curve_op); } } - if (toolsettings->uvsculpt.strength_curve) { - ts->uvsculpt.strength_curve = BKE_curvemapping_copy(toolsettings->uvsculpt.strength_curve); - BKE_curvemapping_init(ts->uvsculpt.strength_curve); + if (toolsettings->uvsculpt.curve_distance_falloff) { + ts->uvsculpt.curve_distance_falloff = BKE_curvemapping_copy( + toolsettings->uvsculpt.curve_distance_falloff); + BKE_curvemapping_init(ts->uvsculpt.curve_distance_falloff); } if (toolsettings->gp_paint) { ts->gp_paint = static_cast(MEM_dupallocN(toolsettings->gp_paint)); @@ -1704,8 +1705,8 @@ void BKE_toolsettings_free(ToolSettings *toolsettings) BKE_paint_free(&toolsettings->sculpt->paint); MEM_freeN(toolsettings->sculpt); } - if (toolsettings->uvsculpt.strength_curve) { - BKE_curvemapping_free(toolsettings->uvsculpt.strength_curve); + if (toolsettings->uvsculpt.curve_distance_falloff) { + BKE_curvemapping_free(toolsettings->uvsculpt.curve_distance_falloff); } if (toolsettings->gp_paint) { BKE_paint_free(&toolsettings->gp_paint->paint); diff --git a/source/blender/blenloader/intern/versioning_420.cc b/source/blender/blenloader/intern/versioning_420.cc index 58ebccab17a..94d9d88e1aa 100644 --- a/source/blender/blenloader/intern/versioning_420.cc +++ b/source/blender/blenloader/intern/versioning_420.cc @@ -967,11 +967,11 @@ void blo_do_versions_420(FileData *fd, Library * /*lib*/, Main *bmain) if (!MAIN_VERSION_FILE_ATLEAST(bmain, 402, 23)) { LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) { ToolSettings *ts = scene->toolsettings; - if (!ts->uvsculpt.strength_curve) { + if (!ts->uvsculpt.curve_distance_falloff) { ts->uvsculpt.size = 50; ts->uvsculpt.strength = 1.0f; - ts->uvsculpt.curve_preset = BRUSH_CURVE_SMOOTH; - ts->uvsculpt.strength_curve = BKE_curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f); + ts->uvsculpt.curve_distance_falloff_preset = BRUSH_CURVE_SMOOTH; + ts->uvsculpt.curve_distance_falloff = BKE_curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f); } } } diff --git a/source/blender/editors/sculpt_paint/sculpt_uv.cc b/source/blender/editors/sculpt_paint/sculpt_uv.cc index e7e1367eed9..229d524f822 100644 --- a/source/blender/editors/sculpt_paint/sculpt_uv.cc +++ b/source/blender/editors/sculpt_paint/sculpt_uv.cc @@ -161,10 +161,11 @@ static void apply_sculpt_data_constraints(UvSculptData *sculptdata, float uv[2]) static float calc_strength(const UvSculptData *sculptdata, float p, const float len) { - float strength = BKE_brush_curve_strength(eBrushCurvePreset(sculptdata->uvsculpt->curve_preset), - sculptdata->uvsculpt->strength_curve, - p, - len); + float strength = BKE_brush_curve_strength( + eBrushCurvePreset(sculptdata->uvsculpt->curve_distance_falloff_preset), + sculptdata->uvsculpt->curve_distance_falloff, + p, + len); CLAMP(strength, 0.0f, 1.0f); @@ -660,7 +661,7 @@ static UvSculptData *uv_sculpt_stroke_init(bContext *C, wmOperator *op, const wm op->customdata = data; - BKE_curvemapping_init(ts->uvsculpt.strength_curve); + BKE_curvemapping_init(ts->uvsculpt.curve_distance_falloff); if (!data) { return nullptr; diff --git a/source/blender/makesdna/DNA_scene_defaults.h b/source/blender/makesdna/DNA_scene_defaults.h index bdb994e1f7b..13c4c66df5d 100644 --- a/source/blender/makesdna/DNA_scene_defaults.h +++ b/source/blender/makesdna/DNA_scene_defaults.h @@ -357,7 +357,7 @@ { \ .size = 100, \ .strength = 1.0f, \ - .curve_preset = BRUSH_CURVE_SMOOTH, \ + .curve_distance_falloff_preset = BRUSH_CURVE_SMOOTH, \ } #define _DNA_DEFAULT_ToolSettings \ diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 057239c11ab..130c19d5366 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -1359,10 +1359,10 @@ typedef struct CurvesSculpt { } CurvesSculpt; typedef struct UvSculpt { - struct CurveMapping *strength_curve; + struct CurveMapping *curve_distance_falloff; int size; float strength; - int8_t curve_preset; /* #eBrushCurvePreset. */ + int8_t curve_distance_falloff_preset; /* #eBrushCurvePreset. */ char _pad[7]; } UvSculpt; diff --git a/source/blender/makesdna/intern/dna_rename_defs.h b/source/blender/makesdna/intern/dna_rename_defs.h index fb34c3fef6f..2752a13eefb 100644 --- a/source/blender/makesdna/intern/dna_rename_defs.h +++ b/source/blender/makesdna/intern/dna_rename_defs.h @@ -236,6 +236,8 @@ DNA_STRUCT_RENAME_MEMBER(TextVars, align_y, align_y_legacy) DNA_STRUCT_RENAME_MEMBER(TextVars, text, text_legacy) DNA_STRUCT_RENAME_MEMBER(ThemeSpace, show_back_grad, background_type) DNA_STRUCT_RENAME_MEMBER(UVProjectModifierData, num_projectors, projectors_num) +DNA_STRUCT_RENAME_MEMBER(UvSculpt, strength_curve, curve_distance_falloff) +DNA_STRUCT_RENAME_MEMBER(UvSculpt, curve_preset, curve_distance_falloff_preset) DNA_STRUCT_RENAME_MEMBER(UnifiedPaintSettings, unprojected_radius, unprojected_size) DNA_STRUCT_RENAME_MEMBER(UserDef, autokey_flag, keying_flag) DNA_STRUCT_RENAME_MEMBER(UserDef, gp_manhattendist, gp_manhattandist) diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.cc b/source/blender/makesrna/intern/rna_sculpt_paint.cc index 90110743ede..b9c554b2c81 100644 --- a/source/blender/makesrna/intern/rna_sculpt_paint.cc +++ b/source/blender/makesrna/intern/rna_sculpt_paint.cc @@ -444,12 +444,12 @@ static void rna_UvSculpt_curve_preset_set(PointerRNA *ptr, int value) { Scene *scene = reinterpret_cast(ptr->owner_id); if (value == BRUSH_CURVE_CUSTOM) { - if (!scene->toolsettings->uvsculpt.strength_curve) { - scene->toolsettings->uvsculpt.strength_curve = BKE_curvemapping_add( + if (!scene->toolsettings->uvsculpt.curve_distance_falloff) { + scene->toolsettings->uvsculpt.curve_distance_falloff = BKE_curvemapping_add( 1, 0.0f, 0.0f, 1.0f, 1.0f); } } - scene->toolsettings->uvsculpt.curve_preset = int8_t(value); + scene->toolsettings->uvsculpt.curve_distance_falloff_preset = int8_t(value); } /** \name Paint mode settings @@ -1269,15 +1269,15 @@ static void rna_def_uv_sculpt(BlenderRNA *brna) RNA_def_property_translation_context(prop, BLT_I18NCONTEXT_AMOUNT); RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, nullptr); - prop = RNA_def_property(srna, "strength_curve", PROP_POINTER, PROP_NONE); + prop = RNA_def_property(srna, "curve_distance_falloff", PROP_POINTER, PROP_NONE); RNA_def_property_struct_type(prop, "CurveMapping"); RNA_def_property_pointer_funcs(prop, nullptr, nullptr, nullptr, nullptr); - RNA_def_property_ui_text(prop, "Strength Curve", ""); + RNA_def_property_ui_text(prop, "Falloff Curve", ""); RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, nullptr); - prop = RNA_def_property(srna, "curve_preset", PROP_ENUM, PROP_NONE); + prop = RNA_def_property(srna, "curve_distance_falloff_preset", PROP_ENUM, PROP_NONE); RNA_def_property_enum_items(prop, rna_enum_brush_curve_preset_items); - RNA_def_property_ui_text(prop, "Strength Curve Preset", ""); + RNA_def_property_ui_text(prop, "Falloff Curve Preset", ""); RNA_def_property_translation_context(prop, BLT_I18NCONTEXT_ID_CURVE_LEGACY); RNA_def_property_enum_funcs(prop, nullptr, "rna_UvSculpt_curve_preset_set", nullptr); RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, nullptr);