griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.5-release'

Browse Source
This commit is contained in:
Sean Kim
2025-06-04 15:45:32 -07:00
parent 653601a416 6a03e8249d
commit 2bbc9e73fc
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/blenkernel/intern/brush.cc
View File

@@ -385,6 +385,13 @@ static void brush_blend_read_data(BlendDataReader *reader, ID *id)
BKE_previewimg_blend_read(reader, brush->preview);
brush->has_unsaved_changes = false;
/* Prior to 5.0, the brush->size value is expected to be the radius, not the diameter. To ensure
* correct behavior, convert this when reading newer files. */
if (BLO_read_fileversion_get(reader) > 500) {
brush->size = std::max(brush->size / 2, 1);
brush->unprojected_radius = std::max(brush->unprojected_radius / 2, 0.001f);
}
}
static void brush_blend_read_after_liblink(BlendLibReader * /*reader*/, ID *id)

7
source/blender/blenkernel/intern/scene.cc
View File

@@ -1224,6 +1224,13 @@ static void scene_blend_read_data(BlendDataReader *reader, ID *id)
zero_v3(ups->last_location);
ups->last_hit = 0;
/* Prior to 5.0, the brush->size value is expected to be the radius, not the diameter. To
* ensure correct behavior, convert this when reading newer files. */
if (BLO_read_fileversion_get(reader)) {
ups->size = std::max(ups->size / 2, 1);
ups->unprojected_radius = std::max(ups->unprojected_radius / 2, 0.001f);
}
BLO_read_struct(reader, CurveMapping, &ups->curve_rand_hue);
if (ups->curve_rand_hue) {
BKE_curvemapping_blend_read(reader, ups->curve_rand_hue);