[Bf-blender-cvs] [f6c649ac037] asset-browser: Cleanup: Rename SpaceFile.mode to SpaceFile.browse_mode
Julian Eisel
noreply at git.blender.org
Tue Aug 25 03:02:18 CEST 2020
Commit: f6c649ac03798ca53edf6a8bfd006d02a91f91d2
Author: Julian Eisel
Date: Mon Aug 24 22:16:08 2020 +0200
Branches: asset-browser
https://developer.blender.org/rBf6c649ac03798ca53edf6a8bfd006d02a91f91d2
Cleanup: Rename SpaceFile.mode to SpaceFile.browse_mode
This differentiates between regular file browsing and asset browsing.
===================================================================
M release/scripts/addons
M release/scripts/startup/bl_ui/space_filebrowser.py
M source/blender/editors/space_file/filesel.c
M source/blender/editors/space_file/space_file.c
M source/blender/makesdna/DNA_space_types.h
M source/blender/makesrna/RNA_enum_types.h
M source/blender/makesrna/intern/rna_space.c
===================================================================
diff --git a/release/scripts/addons b/release/scripts/addons
index b47b6e554b8..26ba60a3f0c 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit b47b6e554b8b49344bb8fa90e70c7de49d53a000
+Subproject commit 26ba60a3f0c8dd229a0ac8f36190490a1ebf5145
diff --git a/release/scripts/startup/bl_ui/space_filebrowser.py b/release/scripts/startup/bl_ui/space_filebrowser.py
index becc8395f91..da8972c2661 100644
--- a/release/scripts/startup/bl_ui/space_filebrowser.py
+++ b/release/scripts/startup/bl_ui/space_filebrowser.py
@@ -173,7 +173,7 @@ def panel_poll_is_upper_region(region):
def panel_poll_is_asset_browsing(context):
- return context.space_data.mode == 'ASSETS'
+ return context.space_data.browse_mode == 'ASSETS'
class FILEBROWSER_UL_dir(UIList):
diff --git a/source/blender/editors/space_file/filesel.c b/source/blender/editors/space_file/filesel.c
index f9a327e9eb5..fd6bbd7a123 100644
--- a/source/blender/editors/space_file/filesel.c
+++ b/source/blender/editors/space_file/filesel.c
@@ -78,7 +78,7 @@
static bool fileselect_needs_refresh(const SpaceFile *sfile)
{
- return sfile->params && (sfile->params->browse_mode != sfile->mode);
+ return sfile->params && (sfile->params->browse_mode != sfile->browse_mode);
}
FileSelectParams *ED_fileselect_get_params(struct SpaceFile *sfile)
@@ -118,7 +118,7 @@ short ED_fileselect_set_params(SpaceFile *sfile)
params = sfile->params;
/* Store which mode these params were created for. */
- params->browse_mode = sfile->mode;
+ params->browse_mode = sfile->browse_mode;
/* set the parameters from the operator, if it exists */
if (op) {
diff --git a/source/blender/editors/space_file/space_file.c b/source/blender/editors/space_file/space_file.c
index d6f75b0621d..e62fadad07b 100644
--- a/source/blender/editors/space_file/space_file.c
+++ b/source/blender/editors/space_file/space_file.c
@@ -256,7 +256,7 @@ static void file_ensure_valid_region_state(bContext *C,
BLI_assert(region_tools);
- if (sfile->mode == FILE_BROWSE_MODE_ASSETS) {
+ if (sfile->browse_mode == FILE_BROWSE_MODE_ASSETS) {
ARegion *region_execute = file_execute_region_ensure(area, region_tools);
ARegion *region_props = file_tool_props_region_ensure(area, region_execute);
@@ -725,20 +725,20 @@ static void file_dropboxes(void)
static int file_space_subtype_get(ScrArea *area)
{
SpaceFile *sfile = area->spacedata.first;
- return sfile->mode;
+ return sfile->browse_mode;
}
static void file_space_subtype_set(ScrArea *area, int value)
{
SpaceFile *sfile = area->spacedata.first;
- sfile->mode = value;
+ sfile->browse_mode = value;
}
static void file_space_subtype_item_extend(bContext *UNUSED(C),
EnumPropertyItem **item,
int *totitem)
{
- RNA_enum_items_add(item, totitem, rna_enum_space_file_mode_items);
+ RNA_enum_items_add(item, totitem, rna_enum_space_file_browse_mode_items);
}
/* only called once, from space/spacetypes.c */
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index bef863d5361..cd5020d2edd 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -728,7 +728,8 @@ typedef struct SpaceFile {
char _pad0[6];
/* End 'SpaceLink' header. */
- char mode; /* eFileBrowse_Mode */
+ /* Is this a File Browser or an Asset Browser? */
+ char browse_mode; /* eFileBrowse_Mode */
char _pad1[3];
int scroll_offset;
@@ -760,10 +761,10 @@ typedef struct SpaceFile {
short systemnr, system_bookmarknr;
} SpaceFile;
-/* SpaceFile.mode (File Space Browsing Mode) */
+/* SpaceFile.browse_mode (File Space Browsing Mode) */
typedef enum eFileBrowse_Mode {
/* Regular Blender File Browser */
- FILE_BROWSE_MODE_REGULAR = 0,
+ FILE_BROWSE_MODE_FILES = 0,
/* Asset Browser */
FILE_BROWSE_MODE_ASSETS = 1,
} eFileBrowse_Mode;
diff --git a/source/blender/makesrna/RNA_enum_types.h b/source/blender/makesrna/RNA_enum_types.h
index acaa4a05336..3b9c2252c05 100644
--- a/source/blender/makesrna/RNA_enum_types.h
+++ b/source/blender/makesrna/RNA_enum_types.h
@@ -55,7 +55,7 @@ extern const EnumPropertyItem rna_enum_mesh_select_mode_items[];
extern const EnumPropertyItem rna_enum_mesh_select_mode_uv_items[];
extern const EnumPropertyItem rna_enum_mesh_delimit_mode_items[];
extern const EnumPropertyItem rna_enum_space_graph_mode_items[];
-extern const EnumPropertyItem rna_enum_space_file_mode_items[];
+extern const EnumPropertyItem rna_enum_space_file_browse_mode_items[];
extern const EnumPropertyItem rna_enum_space_sequencer_view_type_items[];
extern const EnumPropertyItem rna_enum_space_type_items[];
extern const EnumPropertyItem rna_enum_space_image_mode_items[];
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 989cfb42d31..d9632ea5bf0 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -170,8 +170,8 @@ const EnumPropertyItem rna_enum_space_sequencer_view_type_items[] = {
{0, NULL, 0, NULL, NULL},
};
-const EnumPropertyItem rna_enum_space_file_mode_items[] = {
- {FILE_BROWSE_MODE_REGULAR, "REGULAR", ICON_FILEBROWSER, "File Browser", ""},
+const EnumPropertyItem rna_enum_space_file_browse_mode_items[] = {
+ {FILE_BROWSE_MODE_FILES, "FILES", ICON_FILEBROWSER, "File Browser", ""},
{FILE_BROWSE_MODE_ASSETS, "ASSETS", ICON_BLANK1, "Asset Browser", ""},
{0, NULL, 0, NULL, NULL},
};
@@ -2677,9 +2677,9 @@ static void rna_FileBrowser_FSMenuRecent_active_range(
rna_FileBrowser_FSMenu_active_range(ptr, min, max, softmin, softmax, FS_CATEGORY_RECENT);
}
-static void rna_SpaceFileBrowser_mode_update(Main *UNUSED(bmain),
- Scene *UNUSED(scene),
- PointerRNA *ptr)
+static void rna_SpaceFileBrowser_browse_mode_update(Main *UNUSED(bmain),
+ Scene *UNUSED(scene),
+ PointerRNA *ptr)
{
ScrArea *area = rna_area_from_space(ptr);
ED_area_tag_refresh(area);
@@ -5870,13 +5870,13 @@ static void rna_def_space_filebrowser(BlenderRNA *brna)
rna_def_space_generic_show_region_toggles(srna, (1 << RGN_TYPE_TOOLS) | (1 << RGN_TYPE_UI));
- prop = RNA_def_property(srna, "mode", PROP_ENUM, PROP_NONE);
- RNA_def_property_enum_items(prop, rna_enum_space_file_mode_items);
+ prop = RNA_def_property(srna, "browse_mode", PROP_ENUM, PROP_NONE);
+ RNA_def_property_enum_items(prop, rna_enum_space_file_browse_mode_items);
RNA_def_property_ui_text(
prop,
"Browsing Mode",
"Type of the File Editor view (regular file browsing or asset browsing)");
- RNA_def_property_update(prop, 0, "rna_SpaceFileBrowser_mode_update");
+ RNA_def_property_update(prop, 0, "rna_SpaceFileBrowser_browse_mode_update");
prop = RNA_def_property(srna, "params", PROP_POINTER, PROP_NONE);
RNA_def_property_pointer_sdna(prop, NULL, "params");
More information about the Bf-blender-cvs
mailing list