@@ -104,0 +115,4 @@
+  return trait;
+}
+
+AssetTrait *BKE_asset_metadata_trait_add(AssetMetaData *asset_data, const char *name)

@@ -27,0 +30,4 @@
+ */
+typedef struct AssetTrait {
+  struct AssetTrait *next, *prev;
+  char name[64];

@@ -91,0 +103,4 @@
+  ListBase traits; /* AssetTrait */
+  short active_trait;
+  /** Number of traits to avoid counting. Can be moved with tot_tags to runtime data. */
+  short tot_traits;

@@ -440,0 +534,4 @@
+  RNA_def_struct_name_property(srna, prop);
+}
+
+static void rna_def_asset_traits_api(BlenderRNA *brna, PropertyRNA *cprop)

@@ -507,0 +641,4 @@
+  RNA_def_property_struct_type(prop, "AssetTrait");
+  RNA_def_property_editable_func(prop, "rna_AssetMetaData_editable");
+  RNA_def_property_ui_text(prop,
+                           "Traits",

@@ -507,0 +646,4 @@
+                           "general asset management");
+  rna_def_asset_traits_api(brna, prop);
+
+  prop = RNA_def_property(srna, "active_trait", PROP_INT, PROP_NONE);

@@ -1044,0 +1045,4 @@
+{
+  bNodeTree &node_tree = *static_cast<bNodeTree *>(asset_ptr);
+  BLI_assert(GS(node_tree.id.name) == ID_NT);
+  BKE_asset_metadata_trait_ensure(asset_data, node_tree.typeinfo->ui_description);

@@ -1223,0 +1225,4 @@
+{
+  Object *ob = (Object *)asset_ptr;
+  BLI_assert(GS(ob->id.name) == ID_OB);
+  BKE_asset_metadata_trait_ensure(asset_data, get_obdata_defname(ob->type));

@@ -41,1 +41,4 @@
 
+  BKE_asset_metadata_trait_ensure(id->asset_data, "ID");
+  BKE_asset_metadata_trait_ensure(id->asset_data, id_type_info->name);
+  BKE_asset_metadata_trait_ensure(id->asset_data, id->name + 2);

@@ -25,2 +25,4 @@
 } AssetTag;
 
+/**
+ * \brief System-defined trait.

@@ -26,1 +26,4 @@
 
+/**
+ * \brief System-defined trait.
+ * Defined separately from AssetTag because we might want to vary name length.

@@ -91,0 +101,4 @@
+
+  /** System defined keywords for describing the type of asset. */
+  ListBase traits; /* AssetTrait */
+  short active_trait;

@@ -136,0 +141,4 @@
+  return BLI_sprintfN("asset_data.traits[\"%s\"]", asset_trait_name_esc);
+}
+
+static int rna_AssetTrait_editable(PointerRNA *ptr, const char **r_info)

@@ -507,0 +550,4 @@
+  RNA_def_property_ui_text(prop,
+                           "Asset Traits",
+                           "Custom traits (name tokens) for the asset, used for filtering and "
+                           "general asset management");

@@ -89,2 +99,4 @@
 
   char _pad[4];
+
+  /** System defined keywords for describing the type of asset. */

@@ -42,1 +48,4 @@
+  /** Tags and Traits to match against. These are newly allocated, and compared against the
+   * #AssetMetaData.tags and #AssetMetaData.traits. */
   ListBase tags;     /* AssetTag */
+  ListBase traits;   /* AssetTrait */

@@ -2144,6 +2152,47 @@ static const char *get_obdata_defname(int type)
   }
 }
 
+static const char *get_obdata_uiname(int type)

@@ -1223,3 +1231,3 @@
 static AssetTypeInfo AssetType_OB = {
     /*pre_save_fn*/ object_asset_pre_save,
-};
+    /*EnsureTraitsFn*/ object_asset_ensure_traits};

@@ -35,2 +35,4 @@
 } AssetTag;
 
+/**
+ * \brief Keywords describing type characteristics of an asset. Not user-defined.

@@ -37,0 +39,4 @@
+ */
+typedef struct AssetTrait {
+  struct AssetTrait *next, *prev;
+  char name[64]; /* MAX_NAME */

@@ -46,1 +46,4 @@
 
+/** UI Names for object types. These may be written to files,
+ *  so changing these should be done with extreme caution. */
+#define OB_UINAME_MESH "Mesh"

@@ -440,0 +452,4 @@
+
+  srna = RNA_def_struct(brna, "AssetTrait", NULL);
+  RNA_def_struct_path_func(srna, "rna_AssetTrait_path");
+  RNA_def_struct_ui_text(srna, "Asset Trait", "System defined trait (name token)");

@@ -43,0 +46,4 @@
+  if (id_type_info->asset_type_info && id_type_info->asset_type_info->ensure_traits_fn) {
+    id_type_info->asset_type_info->ensure_traits_fn(id, id->asset_data);
+  }
+

@@ -2147,0 +2156,4 @@
+/* Return a string identifying the object type that is *not* translated. */
+static const char *get_obdata_uiname(int type)
+{
+  switch (type) {

@@ -37,0 +40,4 @@
+ */
+typedef struct AssetTrait {
+  struct AssetTrait *next, *prev;
+  char name[64]; /* MAX_NAME */

@@ -1223,2 +1230,4 @@
+
 static AssetTypeInfo AssetType_OB = {
     /*pre_save_fn*/ object_asset_pre_save,
+    /*EnsureTraitsFn*/ object_asset_ensure_traits,

@@ -2147,0 +2156,4 @@
+/* Return a string identifying the object type that is *not* translated. */
+static const char *get_obdata_uiname(int type)
+{
+  switch ((ObjectType)type) {

@@ -101,0 +110,4 @@
+
+  /** See #AssetTrait. */
+  ListBase traits;
+

@@ -440,0 +452,4 @@
+
+  srna = RNA_def_struct(brna, "AssetTrait", NULL);
+  RNA_def_struct_path_func(srna, "rna_AssetTrait_path");
+  RNA_def_struct_ui_text(srna, "Asset Trait", "Asset keywords managed by Blender (not user defined)");

@@ -48,0 +52,4 @@
+#define OB_UI_NAME_SURF "Surface"
+#define OB_UI_NAME_METABALL "Metaball"
+#define OB_UI_NAME_FONT "Text"
+#define OB_UI_NAME_CURVES "Hair Curves"

@@ -136,1 +137,4 @@
 
+static AssetTrait *asset_metadata_trait_add(AssetMetaData *asset_data, const char *const value)
+{
+  AssetTrait *trait = (AssetTrait *)MEM_callocN(sizeof(*trait), __func__);

@@ -137,0 +151,4 @@
+    return result;
+  }
+
+  AssetTrait *trait = (AssetTrait *)BLI_findstring(&asset_data->traits, value, offsetof(AssetTrait, value));

@@ -102,1 +111,4 @@
   char _pad[4];
+
+  /** See #AssetTrait. */
+  ListBase traits;