[Bf-blender-cvs] [f1a0278] master: Fix T37719: NodeTrees lose users on undo.

Lukas Tönne noreply at git.blender.org
Fri Feb 21 10:16:12 CET 2014


Commit: f1a0278e90889ce45bd9bac8140b7726c5d518de
Author: Lukas Tönne
Date:   Fri Feb 21 10:08:49 2014 +0100
https://developer.blender.org/rBf1a0278e90889ce45bd9bac8140b7726c5d518de

Fix T37719: NodeTrees lose users on undo.

The node editor needs to "ensure real user" (id_us_ensure_real) on all
the node trees. This was done correctly for all open groups, but missing
for the base node tree. Function is a bit hidden behind anonymous
arguments in readfile.c ...

===================================================================

M	source/blender/blenloader/intern/readfile.c

===================================================================

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index cfc5092..c14b34a 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -6083,7 +6083,7 @@ void blo_lib_link_screen_restore(Main *newmain, bScreen *curscreen, Scene *cursc
 					if (ntree)
 						snode->nodetree = ntree;
 					else
-						snode->nodetree = restore_pointer_by_name(newmain, (ID*)snode->nodetree, 0);
+						snode->nodetree = restore_pointer_by_name(newmain, (ID*)snode->nodetree, 2);
 					
 					for (path = snode->treepath.first; path; path = path->next) {
 						if (path == snode->treepath.first) {




More information about the Bf-blender-cvs mailing list