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

Fix #144749: Crash on opening a file with a Sculpt toolsettings gravity object.

Browse Source 
Mistake in code is at least 2 years old, interesting that this was never
noticed/reported before...

Candidate for LTS's backport.
This commit is contained in:
Bastien Montagne
2025-08-19 11:50:05 +02:00
parent 8e85423f63
commit a3c4b0b07a
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -683,6 +683,10 @@ static void scene_foreach_toolsettings(LibraryForeachIDData *data,
do_undo_restore,
scene_foreach_paint(data, paint, do_undo_restore, reader, paint_old));
/* WARNING: Handling this object pointer is fairly intricated, to support both 'regular'
* foreach_id processing (in which case both sets of data, current and old, are the same), and
* the restore-after-undo cases. It does not have a helper, because so far it is the only case
* of having to deal with non-'paint' data in a sub-toolsett struct. */
Object *gravity_object = toolsett->sculpt ? toolsett->sculpt->gravity_object : nullptr;
Object *gravity_object_old = toolsett_old->sculpt->gravity_object;
BKE_LIB_FOREACHID_UNDO_PRESERVE_PROCESS_IDSUPER_P(data,
@@ -695,7 +699,11 @@ static void scene_foreach_toolsettings(LibraryForeachIDData *data,
if (toolsett->sculpt) {
toolsett->sculpt->gravity_object = gravity_object;
}
toolsett_old->sculpt->gravity_object = gravity_object_old;
/* Do not re-assign `gravity_object_old` object if both current and old data are the same
* (foreach_id case), that would nullify assignement above, making remapping cases fail. */
if (toolsett_old != toolsett) {
toolsett_old->sculpt->gravity_object = gravity_object_old;
}
}
if (toolsett_old->gp_paint) {
paint = toolsett->gp_paint ? &toolsett->gp_paint->paint : nullptr;