Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2010-04-22 22:19:21 +0400
committerCampbell Barton <ideasman42@gmail.com>2010-04-22 22:19:21 +0400
commit5b666c95ce1fb6baf286a982a66c9e500a84de45 (patch)
tree946fbc3e838cd1ad6a6fb649d14ab47f249b65cc
parente57303e5ac1c31f9c46a5c06487000eee81a45d2 (diff)
skip instancing objects/groups when linking in a scene, the scene has references to the objects/groups its self.
-rw-r--r--source/blender/blenloader/intern/readfile.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index a5349a90c3a..9fe2313ea66 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -12096,7 +12096,10 @@ static void library_append_end(const bContext *C, Main *mainl, FileData **fd, in
/* 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 {