From 59653a450ec02ed4f94aa3f059da069525490a21 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 8 Sep 2020 16:49:17 +1000 Subject: Cleanup: rename group to collection for internal instancing flag Also update old comment. --- source/blender/windowmanager/intern/wm_files_link.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source/blender/windowmanager/intern') 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; } -- cgit v1.2.3