[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28357] trunk/blender/source/blender/ blenloader/intern/readfile.c: skip instancing objects/ groups when linking in a scene, the scene has references to the objects/ groups its self.

[Campbell Barton]

Revision: 28357
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28357
Author:   campbellbarton
Date:     2010-04-22 20:19:21 +0200 (Thu, 22 Apr 2010)

Log Message:
-----------
skip instancing objects/groups when linking in a scene, the scene has references to the objects/groups its self.

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	2010-04-22 18:17:17 UTC (rev 28356)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2010-04-22 18:19:21 UTC (rev 28357)
@@ -12096,7 +12096,10 @@
 
 	/* give a base to loose objects. If group append, do it for objects too */
 	if(scene) {
-		if(idcode==ID_GR) {
+		if(idcode==ID_SCE) {
+			/* dont instance anything when linking in scenes, assume the scene its self instances the data */
+		}
+		else if(idcode==ID_GR) {
 			if (flag & FILE_LINK) {
 				give_base_to_objects(mainvar, scene, NULL, 0);
 			} else {