griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: rename group to collection for internal instancing flag

Browse Source 
Also update old comment.
This commit is contained in:
Campbell Barton
2020-09-08 16:49:17 +10:00
parent d20b08281e
commit 59653a450e
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/blenloader/intern/readfile.c
View File

@@ -10313,9 +10313,9 @@ static void add_loose_objects_to_scene(Main *mainvar,
}
if (flag & FILE_AUTOSELECT) {
base->flag |= BASE_SELECTED;
/* Do NOT make base active here! screws up GUI stuff,
* if you want it do it on src/ level. */
* if you want it do it at the editor level. */
base->flag |= BASE_SELECTED;
}
BKE_scene_object_base_flag_sync_from_base(base);
@@ -10371,6 +10371,8 @@ static void add_loose_object_data_to_scene(Main *mainvar,
}
if (flag & FILE_AUTOSELECT) {
/* Do NOT make base active here! screws up GUI stuff,
* if you want it do it at the editor level. */
base->flag |= BASE_SELECTED;
}
@@ -10398,7 +10400,7 @@ static void add_collections_to_scene(Main *mainvar,
/* Give all objects which are tagged a base. */
LISTBASE_FOREACH (Collection *, collection, &mainvar->collections) {
if ((flag & FILE_GROUP_INSTANCE) && (collection->id.tag & LIB_TAG_DOIT)) {
if ((flag & FILE_COLLECTION_INSTANCE) && (collection->id.tag & LIB_TAG_DOIT)) {
/* Any indirect collection should not have been tagged. */
BLI_assert((collection->id.tag & LIB_TAG_INDIRECT) == 0);

2
source/blender/makesdna/DNA_space_types.h
View File

@@ -816,7 +816,7 @@ typedef enum eFileSel_Params_Flag {
FILE_DIRSEL_ONLY = (1 << 7),
FILE_FILTER = (1 << 8),
FILE_OBDATA_INSTANCE = (1 << 9),
FILE_GROUP_INSTANCE = (1 << 10),
FILE_COLLECTION_INSTANCE = (1 << 10),
FILE_SORT_INVERT = (1 << 11),
FILE_HIDE_TOOL_PROPS = (1 << 12),
FILE_CHECK_EXISTING = (1 << 13),

6
source/blender/windowmanager/intern/wm_files_link.c
View File

@@ -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;
}