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:
authorBastien Montagne <montagne29@wanadoo.fr>2019-03-20 12:28:46 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2019-03-20 12:30:50 +0300
commit21cd575e88a253c14348c68b6b2def8289fcfd76 (patch)
treeb32fc234870b63451b59207fde53e770c66785be /source/blender/blenloader
parenta23197655c61e82a910577c2b5ac32e99137b558 (diff)
Fix (unreported) Copy/Paste: orig object being instantiated in active collection on pasting.
When copy/pasting an object in same .blend file, orig object would be instantiated into the active collection when pasting, along with the content of the paste. Was missing a clear of LIB_TAG_DOIT on objects... Found while investigating T61670.
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r--source/blender/blenloader/intern/readfile.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index b8131c8abbb..221125fefbe 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -11106,7 +11106,8 @@ static Main *library_link_begin(Main *mainvar, FileData **fd, const char *filepa
(*fd)->mainlist = MEM_callocN(sizeof(ListBase), "FileData.mainlist");
- /* clear for collection instantiating tag */
+ /* clear for objects and collections instantiating tag */
+ BKE_main_id_tag_listbase(&(mainvar->objects), LIB_TAG_DOIT, false);
BKE_main_id_tag_listbase(&(mainvar->collections), LIB_TAG_DOIT, false);
/* make mains */