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-21 15:02:38 -07:00
parent da4eda148b 99d4e7e330
commit 3d507c4afe
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -396,7 +396,7 @@ static void brush_blend_read_data(BlendDataReader *reader, ID *id)
/* 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) {
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);
}

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

@@ -1256,7 +1256,7 @@ static void scene_blend_read_data(BlendDataReader *reader, ID *id)
/* 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) {
if (BLO_read_fileversion_get(reader) >= 500) {
ups->size = std::max(ups->size / 2, 1);
ups->unprojected_radius = std::max(ups->unprojected_radius / 2, 0.001f);
}