[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14098] trunk/blender/source/blender/ blenloader/intern/readfile.c: line commented out with the orange merge is needed for library linking when linking in objects that indirectly point to groups that are already directly linked in .

Campbell Barton ideasman42 at gmail.com
Thu Mar 13 22:41:29 CET 2008


Revision: 14098
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14098
Author:   campbellbarton
Date:     2008-03-13 22:41:28 +0100 (Thu, 13 Mar 2008)

Log Message:
-----------
line commented out with the orange merge is needed for library linking when linking in objects that indirectly point to groups that are already directly linked in. This has been a problem for many peach scenes. but saving and reloading made the objects appear.

Modified Paths:
--------------
    trunk/blender/source/blender/blenloader/intern/readfile.c

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2008-03-13 21:14:11 UTC (rev 14097)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2008-03-13 21:41:28 UTC (rev 14098)
@@ -7789,7 +7789,12 @@
 					ptr->curlib->parent= mainvar->curlib;
 				}
 				else {
-					//oldnewmap_insert(fd->libmap, bhead->old, id, 1);
+					/* The line below was commented by Ton (I assume), when Hos did the merge from the orange branch. rev 6568
+					 * This line is NEEDED, the case is that you have 3 blend files...
+					 * user.blend, lib.blend and lib_indirect.blend - if user.blend alredy references a "tree" from
+					 * lib_indirect.blend but lib.blend does too, linking in a Scene or Group from lib.blend can result in an
+					 * empty without the dupli group referenced. Once you save and reload the group would appier. - Campbell */
+					oldnewmap_insert(fd->libmap, bhead->old, id, 1);
 					
 					change_idid_adr_fd(fd, bhead->old, id);
 					if(G.f & G_DEBUG) printf("expand_doit: already linked: %s lib: %s\n", id->name, lib->name);





More information about the Bf-blender-cvs mailing list