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:
authorTon Roosendaal <ton@blender.org>2004-11-21 14:44:50 +0300
committerTon Roosendaal <ton@blender.org>2004-11-21 14:44:50 +0300
commitf2aa00d2d034e943940d1b3078617eaa1a6efecd (patch)
tree450cc0a48eebf4cc6872458fea870c7914fa2aab /source/blender/blenloader/intern
parent0069a4889774d6e6783fb95e0436ee966a3cbf6a (diff)
Bug fix #1859
Appending or Linking data from other file always cleared scene scriptlinks, due to having 1 line of code just on wrong location... is bug since 2.25, so finally something again I didn't recently break in working code :)
Diffstat (limited to 'source/blender/blenloader/intern')
-rw-r--r--source/blender/blenloader/intern/readfile.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index c67a0282bf1..ee2c39d2d5a 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -2412,11 +2412,12 @@ static void lib_link_scene(FileData *fd, Main *main)
}
END_SEQ
}
+
+ lib_link_scriptlink(fd, &sce->id, &sce->scriptlink);
+
sce->id.flag -= LIB_NEEDLINK;
}
- lib_link_scriptlink(fd, &sce->id, &sce->scriptlink);
-
sce= sce->id.next;
}
}