blender
/
blender
134
399
Fork 581
Code Issues 6.3k Pull Requests 759 Projects 19 Wiki Activity

Fix T48980: crash when loading a file that contains a custom node tree. 

Syupid logical mistake in own recent rB018d336cbd51...
This commit is contained in:
Bastien Montagne 2016-07-31 20:07:33 +02:00
parent dda2d1dbea
commit 36a790653c
Notes: blender-bot 2023-02-14 08:47:25 +01:00 
Referenced by issue #48980, crash when loading a file that contains a custom node tree
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6338,10 +6338,8 @@ static void lib_link_screen(FileData *fd, Main *main)
snode->id = newlibadr(fd, sc->id.lib, snode->id);
snode->from = newlibadr(fd, sc->id.lib, snode->from);
if (snode->id) {
ntree = ntreeFromID(snode->id);
snode->nodetree = ntree ? ntree : newlibadr_us(fd, sc->id.lib, snode->nodetree);
}
ntree = snode->id ? ntreeFromID(snode->id) : NULL;
snode->nodetree = ntree ? ntree : newlibadr_us(fd, sc->id.lib, snode->nodetree);
for (path = snode->treepath.first; path; path = path->next) {
if (path == snode->treepath.first) {
@ -6720,11 +6718,8 @@ void blo_lib_link_screen_restore(Main *newmain, bScreen *curscreen, Scene *cursc
snode->id = restore_pointer_by_name(id_map, snode->id, USER_REAL);
snode->from = restore_pointer_by_name(id_map, snode->from, USER_IGNORE);
if (snode->id) {
ntree = ntreeFromID(snode->id);
snode->nodetree = ntree ? ntree :
restore_pointer_by_name(id_map, (ID *)snode->nodetree, USER_REAL);
}
ntree = snode->id ? ntreeFromID(snode->id) : NULL;
snode->nodetree = ntree ? ntree : restore_pointer_by_name(id_map, (ID *)snode->nodetree, USER_REAL);
for (path = snode->treepath.first; path; path = path->next) {
if (path == snode->treepath.first) {