[Bf-blender-cvs] [f32d46121b6] asset-browser: Merge branch 'temp-review-asset-filelists' into temp-review-asset-browser-ui

[Julian Eisel]

Commit: f32d46121b6424819bf98f647f63abe257ef3aa2
Author: Julian Eisel
Date:   Thu Dec 10 20:10:22 2020 +0100
Branches: asset-browser
https://developer.blender.org/rBf32d46121b6424819bf98f647f63abe257ef3aa2

Merge branch 'temp-review-asset-filelists' into temp-review-asset-browser-ui

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



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

diff --cc source/blender/makesrna/intern/rna_space.c
index 2e1e03ac78d,8ea886ef260..95fe9c4c67b
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@@ -2578,6 -2579,6 +2579,18 @@@ static const EnumPropertyItem *rna_File
    return item;
  }
  
++static void rna_FileAssetSelectParams_asset_category_set(PointerRNA *ptr, uint64_t value)
++{
++  FileSelectParams *params = ptr->data;
++  params->filter_id = value;
++}
++
++static uint64_t rna_FileAssetSelectParams_asset_category_get(PointerRNA *ptr)
++{
++  FileSelectParams *params = ptr->data;
++  return params->filter_id;
++}
++
  static void rna_FileBrowser_FileSelectEntry_name_get(PointerRNA *ptr, char *value)
  {
    const FileDirEntry *entry = ptr->data;
@@@ -6232,31 -6197,32 +6209,82 @@@ static void rna_def_fileselect_params(B
    RNA_def_property_flag(prop, PROP_TEXTEDIT_UPDATE);
    RNA_def_property_update(prop, NC_SPACE | ND_SPACE_FILE_LIST, NULL);
  
+   prop = RNA_def_property(srna, "display_size", PROP_ENUM, PROP_NONE);
+   RNA_def_property_enum_sdna(prop, NULL, "thumbnail_size");
+   RNA_def_property_enum_items(prop, display_size_items);
+   RNA_def_property_ui_text(prop,
+                            "Display Size",
+                            "Change the size of the display (width of columns or thumbnails size)");
+   RNA_def_property_update(prop, NC_SPACE | ND_SPACE_FILE_LIST, NULL);
+ }
+ 
+ static void rna_def_fileselect_asset_params(BlenderRNA *brna)
+ {
+   StructRNA *srna;
+   PropertyRNA *prop;
+ 
++  /* XXX copied from rna_def_fileselect_idfilter. */
++  static const EnumPropertyItem asset_category_items[] = {
++      {FILTER_ID_SCE, "SCENES", ICON_SCENE_DATA, "Scenes", "Show scenes"},
++      {FILTER_ID_AC, "ANIMATIONS", ICON_ANIM_DATA, "Animations", "Show animation data"},
++      {FILTER_ID_OB | FILTER_ID_GR,
++       "OBJECTS_AND_COLLECTIONS",
++       ICON_GROUP,
++       "Objects & Collections",
++       "Show objects and collections"},
++      {FILTER_ID_AR | FILTER_ID_CU | FILTER_ID_LT | FILTER_ID_MB | FILTER_ID_ME
++       /* XXX avoid warning */
++       // | FILTER_ID_HA | FILTER_ID_PT | FILTER_ID_VO
++       ,
++       "GEOMETRY",
++       ICON_MESH_DATA,
++       "Geometry",
++       "Show meshes, curves, lattice, armatures and metaballs data"},
++      {FILTER_ID_LS | FILTER_ID_MA | FILTER_ID_NT | FILTER_ID_TE,
++       "SHADING",
++       ICON_MATERIAL_DATA,
++       "Shading",
++       "Show materials, nodetrees, textures and Freestyle's linestyles"},
++      {FILTER_ID_IM | FILTER_ID_MC | FILTER_ID_MSK | FILTER_ID_SO,
++       "IMAGES_AND_SOUNDS",
++       ICON_IMAGE_DATA,
++       "Images & Sounds",
++       "Show images, movie clips, sounds and masks"},
++      {FILTER_ID_CA | FILTER_ID_LA | FILTER_ID_LP | FILTER_ID_SPK | FILTER_ID_WO | FILTER_ID_WS,
++       "ENVIRONMENTS",
++       ICON_WORLD_DATA,
++       "Environment",
++       "Show worlds, lights, cameras and speakers"},
++      {FILTER_ID_BR | FILTER_ID_GD | FILTER_ID_PA | FILTER_ID_PAL | FILTER_ID_PC | FILTER_ID_TXT |
++           FILTER_ID_VF | FILTER_ID_CF,
++       "MISC",
++       ICON_GREASEPENCIL,
++       "Miscellaneous",
++       "Show other data types"},
++      {0, NULL, 0, NULL, NULL},
++  };
++
+   srna = RNA_def_struct(brna, "FileAssetSelectParams", "FileSelectParams");
+   RNA_def_struct_ui_text(
+       srna, "Asset Select Parameters", "Settings for the file selection in Asset Browser mode");
+ 
    prop = RNA_def_property(srna, "asset_library", PROP_ENUM, PROP_NONE);
    RNA_def_property_enum_items(prop, DummyRNA_NULL_items);
    RNA_def_property_enum_funcs(prop,
-                               "rna_FileSelectParams_asset_library_get",
-                               "rna_FileSelectParams_asset_library_set",
-                               "rna_FileSelectParams_asset_library_itemf");
+                               "rna_FileAssetSelectParams_asset_library_get",
+                               "rna_FileAssetSelectParams_asset_library_set",
+                               "rna_FileAssetSelectParams_asset_library_itemf");
    RNA_def_property_ui_text(prop, "Asset Library", "");
    RNA_def_property_update(prop, NC_SPACE | ND_SPACE_FILE_PARAMS, NULL);
 +
 +  prop = RNA_def_property(srna, "asset_category", PROP_ENUM, PROP_NONE);
 +  RNA_def_property_enum_items(prop, asset_category_items);
 +  RNA_def_property_enum_funcs(prop,
-                               "rna_FileSelectParams_asset_category_get",
-                               "rna_FileSelectParams_asset_category_set",
++                              "rna_FileAssetSelectParams_asset_category_get",
++                              "rna_FileAssetSelectParams_asset_category_set",
 +                              NULL);
 +  RNA_def_property_ui_text(prop, "Asset Category", "Determine which kind of assets to display");
 +  RNA_def_property_update(prop, NC_SPACE | ND_SPACE_FILE_LIST, NULL);
- 
-   prop = RNA_def_property(srna, "display_size", PROP_ENUM, PROP_NONE);
-   RNA_def_property_enum_sdna(prop, NULL, "thumbnail_size");
-   RNA_def_property_enum_items(prop, display_size_items);
-   RNA_def_property_ui_text(prop,
-                            "Display Size",
-                            "Change the size of the display (width of columns or thumbnails size)");
-   RNA_def_property_update(prop, NC_SPACE | ND_SPACE_FILE_LIST, NULL);
  }
  
  static void rna_def_filemenu_entry(BlenderRNA *brna)