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>2020-09-08 09:49:17 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-09-08 09:49:17 +0300
commit59653a450ec02ed4f94aa3f059da069525490a21 (patch)
tree1346a4969d734b87899d327f2d3bce7e011b9b8b /source/blender/windowmanager/intern
parentd20b08281e0e5cf47b7b549910b6f5ab7f61e57d (diff)
Cleanup: rename group to collection for internal instancing flag
Also update old comment.
Diffstat (limited to 'source/blender/windowmanager/intern')
-rw-r--r--source/blender/windowmanager/intern/wm_files_link.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/windowmanager/intern/wm_files_link.c b/source/blender/windowmanager/intern/wm_files_link.c
index 559eb6a78c2..6ed9dcd4cdc 100644
--- a/source/blender/windowmanager/intern/wm_files_link.c
+++ b/source/blender/windowmanager/intern/wm_files_link.c
@@ -135,7 +135,7 @@ static short wm_link_append_flag(wmOperator *op)
flag |= FILE_LINK;
}
if (RNA_boolean_get(op->ptr, "instance_collections")) {
- flag |= FILE_GROUP_INSTANCE;
+ flag |= FILE_COLLECTION_INSTANCE;
}
if (RNA_boolean_get(op->ptr, "instance_object_data")) {
flag |= FILE_OBDATA_INSTANCE;
@@ -397,9 +397,9 @@ static int wm_link_append_exec(bContext *C, wmOperator *op)
if (scene && scene->id.lib) {
BKE_reportf(op->reports,
RPT_WARNING,
- "Scene '%s' is linked, instantiation of objects & groups is disabled",
+ "Scene '%s' is linked, instantiation of objects is disabled",
scene->id.name + 2);
- flag &= ~(FILE_GROUP_INSTANCE | FILE_OBDATA_INSTANCE);
+ flag &= ~(FILE_COLLECTION_INSTANCE | FILE_OBDATA_INSTANCE);
scene = NULL;
}