[Bf-blender-cvs] [b3c469153ef] master: Asset Browser: Use single column for asset library menu

[Julian Eisel]

Commit: b3c469153efe0e3f4f36a6bf6667d47727a5a743
Author: Julian Eisel
Date:   Sat Oct 16 09:55:31 2021 +0200
Branches: master
https://developer.blender.org/rBb3c469153efe0e3f4f36a6bf6667d47727a5a743

Asset Browser: Use single column for asset library menu

Feedback was that the two column menu felt odd, and that the "Custom" and
"Built-in" headings for each column were more confusing than helpful. So
changing this to a single column menu with separator lines instead of headings.

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

M	source/blender/editors/asset/intern/asset_library_reference_enum.cc

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

diff --git a/source/blender/editors/asset/intern/asset_library_reference_enum.cc b/source/blender/editors/asset/intern/asset_library_reference_enum.cc
index b74fe40ec2e..c57d121a18f 100644
--- a/source/blender/editors/asset/intern/asset_library_reference_enum.cc
+++ b/source/blender/editors/asset/intern/asset_library_reference_enum.cc
@@ -116,10 +116,12 @@ const EnumPropertyItem *ED_asset_library_reference_to_rna_enum_itemf()
   EnumPropertyItem *item = nullptr;
   int totitem = 0;
 
+  /* Add predefined items. */
+  RNA_enum_items_add(&item, &totitem, predefined_items);
+
   /* Add separator if needed. */
   if (!BLI_listbase_is_empty(&U.asset_libraries)) {
-    const EnumPropertyItem sepr = {0, "", 0, "Custom", nullptr};
-    RNA_enum_item_add(&item, &totitem, &sepr);
+    RNA_enum_item_add_separator(&item, &totitem);
   }
 
   int i = 0;
@@ -144,14 +146,6 @@ const EnumPropertyItem *ED_asset_library_reference_to_rna_enum_itemf()
     RNA_enum_item_add(&item, &totitem, &tmp);
   }
 
-  if (totitem) {
-    const EnumPropertyItem sepr = {0, "", 0, "Built-in", nullptr};
-    RNA_enum_item_add(&item, &totitem, &sepr);
-  }
-
-  /* Add predefined items. */
-  RNA_enum_items_add(&item, &totitem, predefined_items);
-
   RNA_enum_item_end(&item, &totitem);
   return item;
 }