[Bf-blender-cvs] [43badbd631c] blender2.8: Rename: FILE_ACTIVELAY > FILE_ACTIVE_COLLECTION

[Dalai Felinto]

Commit: 43badbd631cf130e4d7b2ec9a4a4ef31c5225ef1
Author: Dalai Felinto
Date:   Fri May 26 17:41:50 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB43badbd631cf130e4d7b2ec9a4a4ef31c5225ef1

Rename: FILE_ACTIVELAY > FILE_ACTIVE_COLLECTION

===================================================================

M	source/blender/blenloader/intern/readfile.c
M	source/blender/editors/space_file/filesel.c
M	source/blender/editors/space_view3d/view3d_ops.c
M	source/blender/makesdna/DNA_space_types.h
M	source/blender/windowmanager/intern/wm_files_link.c

===================================================================

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 60b77a25646..c387f4669dc 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -10112,7 +10112,7 @@ static SceneCollection *get_scene_collection_active_or_create(struct Scene *scen
 {
 	LayerCollection *lc = NULL;
 
-	if (flag & FILE_ACTIVELAY) {
+	if (flag & FILE_ACTIVE_COLLECTION) {
 		lc = BKE_layer_collection_get_active_ensure(scene, sl);
 	}
 	else {
@@ -10408,7 +10408,7 @@ static void library_link_end(Main *mainl, FileData **fd, const short flag, Scene
 	 * Only directly linked objects & groups are instantiated by `BLO_library_link_named_part_ex()` & co,
 	 * here we handle indirect ones and other possible edge-cases. */
 	if (scene) {
-		SceneCollection *sc = get_scene_collection_active_or_create(scene, sl, FILE_ACTIVELAY);
+		SceneCollection *sc = get_scene_collection_active_or_create(scene, sl, FILE_ACTIVE_COLLECTION);
 		give_base_to_objects(mainvar, scene, sl, sc, curlib, flag);
 
 		if (flag & FILE_GROUP_INSTANCE) {
diff --git a/source/blender/editors/space_file/filesel.c b/source/blender/editors/space_file/filesel.c
index 96b241647b6..c2700233cf5 100644
--- a/source/blender/editors/space_file/filesel.c
+++ b/source/blender/editors/space_file/filesel.c
@@ -228,7 +228,7 @@ short ED_fileselect_set_params(SpaceFile *sfile)
 		if (params->type == FILE_LOADLIB) {
 			params->flag |= RNA_boolean_get(op->ptr, "link") ? FILE_LINK : 0;
 			params->flag |= RNA_boolean_get(op->ptr, "autoselect") ? FILE_AUTOSELECT : 0;
-			params->flag |= RNA_boolean_get(op->ptr, "active_collection") ? FILE_ACTIVELAY : 0;
+			params->flag |= RNA_boolean_get(op->ptr, "active_collection") ? FILE_ACTIVE_COLLECTION : 0;
 		}
 
 		if ((prop = RNA_struct_find_property(op->ptr, "display_type"))) {
diff --git a/source/blender/editors/space_view3d/view3d_ops.c b/source/blender/editors/space_view3d/view3d_ops.c
index e2b19075f95..6f05dd353d7 100644
--- a/source/blender/editors/space_view3d/view3d_ops.c
+++ b/source/blender/editors/space_view3d/view3d_ops.c
@@ -120,7 +120,7 @@ static int view3d_pastebuffer_exec(bContext *C, wmOperator *op)
 	if (RNA_boolean_get(op->ptr, "autoselect"))
 		flag |= FILE_AUTOSELECT;
 	if (RNA_boolean_get(op->ptr, "active_collection"))
-		flag |= FILE_ACTIVELAY;
+		flag |= FILE_ACTIVE_COLLECTION;
 
 	BLI_make_file_string("/", str, BKE_tempdir_base(), "copybuffer.blend");
 	if (BKE_copybuffer_paste(C, str, flag, op->reports)) {
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index 49600158ac8..833db376191 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -713,7 +713,7 @@ typedef enum eFileSel_Params_Flag {
 	FILE_LINK           = (1 << 2),
 	FILE_HIDE_DOT       = (1 << 3),
 	FILE_AUTOSELECT     = (1 << 4),
-	FILE_ACTIVELAY      = (1 << 5),
+	FILE_ACTIVE_COLLECTION = (1 << 5),
 /*  FILE_ATCURSOR       = (1 << 6), */ /* deprecated */
 	FILE_DIRSEL_ONLY    = (1 << 7),
 	FILE_FILTER         = (1 << 8),
diff --git a/source/blender/windowmanager/intern/wm_files_link.c b/source/blender/windowmanager/intern/wm_files_link.c
index 871c817384c..82e9be3970f 100644
--- a/source/blender/windowmanager/intern/wm_files_link.c
+++ b/source/blender/windowmanager/intern/wm_files_link.c
@@ -134,7 +134,7 @@ static short wm_link_append_flag(wmOperator *op)
 	if (RNA_boolean_get(op->ptr, "autoselect"))
 		flag |= FILE_AUTOSELECT;
 	if (RNA_boolean_get(op->ptr, "active_collection"))
-		flag |= FILE_ACTIVELAY;
+		flag |= FILE_ACTIVE_COLLECTION;
 	if ((prop = RNA_struct_find_property(op->ptr, "relative_path")) && RNA_property_boolean_get(op->ptr, prop))
 		flag |= FILE_RELPATH;
 	if (RNA_boolean_get(op->ptr, "link"))