blender
/
blender
130
398
Fork 573
Code Issues 6.2k Pull Requests 746 Projects 19 Wiki Activity

Fix T41411: Undo crashing with background images set. 

Since 3DViews use IDs like images or clips, we can't skip anymore `lib_link_screen()`
when reading from mem for undo/redo stuff. Else, freeing (unused) screen in `BKE_read_file_from_memfile()`
will lead to using data already freed (since pointers have not been updated when reading that undo step).
This commit is contained in:
Bastien Montagne 2014-08-12 16:02:44 +02:00
parent 0bcc8d5cd3
commit ca5c02fc93
Notes: blender-bot 2023-02-14 10:15:18 +01:00 
Referenced by issue #41411, Undo crashing with background images set
Referenced by issue #41358, Complete crash when using CTRL-Z with graph editor open
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/blenloader/intern/readfile.c
View File

@ -5960,8 +5960,12 @@ void blo_lib_link_screen_restore(Main *newmain, bScreen *curscreen, Scene *cursc
v3d->ob_centre = restore_pointer_by_name(newmain, (ID *)v3d->ob_centre, USER_ONE);
for (bgpic= v3d->bgpicbase.first; bgpic; bgpic= bgpic->next) {
bgpic->ima = restore_pointer_by_name(newmain, (ID *)bgpic->ima, USER_ONE);
bgpic->clip = restore_pointer_by_name(newmain, (ID *)bgpic->clip, USER_ONE);
if ((bgpic->ima = restore_pointer_by_name(newmain, (ID *)bgpic->ima, USER_IGNORE))) {
id_us_plus((ID *)bgpic->ima);
}
if ((bgpic->clip = restore_pointer_by_name(newmain, (ID *)bgpic->clip, USER_IGNORE))) {
id_us_plus((ID *)bgpic->clip);
}
}
if (v3d->localvd) {
/*Base *base;*/
@ -7540,8 +7544,9 @@ static void lib_link_all(FileData *fd, Main *main)
/* No load UI for undo memfiles */
if (fd->memfile == NULL) {
lib_link_windowmanager(fd, main);
lib_link_screen(fd, main);
}
/* DO NOT skip screens here, 3Dview may contains pointers to other ID data (like bgpic)! See T41411. */
lib_link_screen(fd, main);
lib_link_scene(fd, main);
lib_link_object(fd, main);
lib_link_curve(fd, main);