Cleanup: Brush: Move to IDTypeInfo, and remove unused BKE API.

source/blender/blenkernel/BKE_brush.h

@@ -45,18 +45,11 @@ void BKE_brush_system_init(void);
 void BKE_brush_system_exit(void);
 
 /* datablock functions */
-void BKE_brush_init(struct Brush *brush);
 struct Brush *BKE_brush_add(struct Main *bmain, const char *name, const eObjectMode ob_mode);
 struct Brush *BKE_brush_add_gpencil(struct Main *bmain, struct ToolSettings *ts, const char *name);
 void BKE_brush_init_gpencil_settings(struct Brush *brush);
 struct Brush *BKE_brush_first_search(struct Main *bmain, const eObjectMode ob_mode);
-void BKE_brush_copy_data(struct Main *bmain,
-                         struct Brush *brush_dst,
-                         const struct Brush *brush_src,
-                         const int flag);
 struct Brush *BKE_brush_copy(struct Main *bmain, const struct Brush *brush);
-void BKE_brush_make_local(struct Main *bmain, struct Brush *brush, const int flags);
-void BKE_brush_free(struct Brush *brush);
 
 void BKE_brush_sculpt_reset(struct Brush *brush);
 void BKE_brush_gpencil_presets(struct Main *bmain, struct ToolSettings *ts);

source/blender/blenkernel/BKE_idtype.h

@@ -148,7 +148,7 @@ extern IDTypeInfo IDType_ID_WO;
 // extern IDTypeInfo IDType_ID_AR;
 // extern IDTypeInfo IDType_ID_AC;
 // extern IDTypeInfo IDType_ID_NT;
-// extern IDTypeInfo IDType_ID_BR;
+extern IDTypeInfo IDType_ID_BR;
 // extern IDTypeInfo IDType_ID_PA;
 // extern IDTypeInfo IDType_ID_GD;
 // extern IDTypeInfo IDType_ID_WM;

source/blender/blenkernel/intern/brush.c

@@ -30,9 +30,12 @@
 #include "BLI_math.h"
 #include "BLI_rand.h"
 
+#include "BLT_translation.h"
+
 #include "BKE_brush.h"
 #include "BKE_colortools.h"
 #include "BKE_context.h"
+#include "BKE_idtype.h"
 #include "BKE_lib_id.h"
 #include "BKE_lib_query.h"
 #include "BKE_lib_remap.h"
@@ -48,6 +51,131 @@
 
 #include "RE_render_ext.h" /* externtex */
 
+static void brush_init_data(ID *id)
+{
+  Brush *brush = (Brush *)id;
+  BLI_assert(MEMCMP_STRUCT_AFTER_IS_ZERO(brush, id));
+
+  MEMCPY_STRUCT_AFTER(brush, DNA_struct_default_get(Brush), id);
+
+  /* enable fake user by default */
+  id_fake_user_set(&brush->id);
+
+  /* the default alpha falloff curve */
+  BKE_brush_curve_preset(brush, CURVE_PRESET_SMOOTH);
+}
+
+static void brush_copy_data(Main *UNUSED(bmain), ID *id_dst, const ID *id_src, const int flag)
+{
+  Brush *brush_dst = (Brush *)id_dst;
+  const Brush *brush_src = (const Brush *)id_src;
+  if (brush_src->icon_imbuf) {
+    brush_dst->icon_imbuf = IMB_dupImBuf(brush_src->icon_imbuf);
+  }
+
+  if ((flag & LIB_ID_COPY_NO_PREVIEW) == 0) {
+    BKE_previewimg_id_copy(&brush_dst->id, &brush_src->id);
+  }
+  else {
+    brush_dst->preview = NULL;
+  }
+
+  brush_dst->curve = BKE_curvemapping_copy(brush_src->curve);
+  if (brush_src->gpencil_settings != NULL) {
+    brush_dst->gpencil_settings = MEM_dupallocN(brush_src->gpencil_settings);
+    brush_dst->gpencil_settings->curve_sensitivity = BKE_curvemapping_copy(
+        brush_src->gpencil_settings->curve_sensitivity);
+    brush_dst->gpencil_settings->curve_strength = BKE_curvemapping_copy(
+        brush_src->gpencil_settings->curve_strength);
+    brush_dst->gpencil_settings->curve_jitter = BKE_curvemapping_copy(
+        brush_src->gpencil_settings->curve_jitter);
+  }
+
+  /* enable fake user by default */
+  id_fake_user_set(&brush_dst->id);
+}
+
+static void brush_free_data(ID *id)
+{
+  Brush *brush = (Brush *)id;
+  if (brush->icon_imbuf) {
+    IMB_freeImBuf(brush->icon_imbuf);
+  }
+  BKE_curvemapping_free(brush->curve);
+
+  if (brush->gpencil_settings != NULL) {
+    BKE_curvemapping_free(brush->gpencil_settings->curve_sensitivity);
+    BKE_curvemapping_free(brush->gpencil_settings->curve_strength);
+    BKE_curvemapping_free(brush->gpencil_settings->curve_jitter);
+    MEM_SAFE_FREE(brush->gpencil_settings);
+  }
+
+  MEM_SAFE_FREE(brush->gradient);
+
+  BKE_previewimg_free(&(brush->preview));
+}
+
+static void brush_make_local(Main *bmain, ID *id, const int flags)
+{
+  Brush *brush = (Brush *)id;
+  const bool lib_local = (flags & LIB_ID_MAKELOCAL_FULL_LIBRARY) != 0;
+  bool is_local = false, is_lib = false;
+
+  /* - only lib users: do nothing (unless force_local is set)
+   * - only local users: set flag
+   * - mixed: make copy
+   */
+
+  if (!ID_IS_LINKED(brush)) {
+    return;
+  }
+
+  if (brush->clone.image) {
+    /* Special case: ima always local immediately. Clone image should only have one user anyway. */
+    BKE_lib_id_make_local(bmain, &brush->clone.image->id, false, 0);
+  }
+
+  BKE_library_ID_test_usages(bmain, brush, &is_local, &is_lib);
+
+  if (lib_local || is_local) {
+    if (!is_lib) {
+      BKE_lib_id_clear_library_data(bmain, &brush->id);
+      BKE_lib_id_expand_local(bmain, &brush->id);
+
+      /* enable fake user by default */
+      id_fake_user_set(&brush->id);
+    }
+    else {
+      Brush *brush_new = BKE_brush_copy(bmain, brush); /* Ensures FAKE_USER is set */
+
+      brush_new->id.us = 0;
+
+      /* setting newid is mandatory for complex make_lib_local logic... */
+      ID_NEW_SET(brush, brush_new);
+
+      if (!lib_local) {
+        BKE_libblock_remap(bmain, brush, brush_new, ID_REMAP_SKIP_INDIRECT_USAGE);
+      }
+    }
+  }
+}
+
+IDTypeInfo IDType_ID_BR = {
+    .id_code = ID_BR,
+    .id_filter = FILTER_ID_BR,
+    .main_listbase_index = INDEX_ID_BR,
+    .struct_size = sizeof(Brush),
+    .name = "Brush",
+    .name_plural = "brushes",
+    .translation_context = BLT_I18NCONTEXT_ID_BRUSH,
+    .flags = 0,
+
+    .init_data = brush_init_data,
+    .copy_data = brush_copy_data,
+    .free_data = brush_free_data,
+    .make_local = brush_make_local,
+};
+
 static RNG *brush_rng;
 
 void BKE_brush_system_init(void)
@@ -116,19 +244,6 @@ static void brush_defaults(Brush *brush)
 
 /* Datablock add/copy/free/make_local */
 
-void BKE_brush_init(Brush *brush)
-{
-  BLI_assert(MEMCMP_STRUCT_AFTER_IS_ZERO(brush, id));
-
-  MEMCPY_STRUCT_AFTER(brush, DNA_struct_default_get(Brush), id);
-
-  /* enable fake user by default */
-  id_fake_user_set(&brush->id);
-
-  /* the default alpha falloff curve */
-  BKE_brush_curve_preset(brush, CURVE_PRESET_SMOOTH);
-}
-
 /**
  * \note Resulting brush will have two users: one as a fake user,
  * another is assumed to be used by the caller.
@@ -139,7 +254,7 @@ Brush *BKE_brush_add(Main *bmain, const char *name, const eObjectMode ob_mode)
 
   brush = BKE_libblock_alloc(bmain, ID_BR, name, 0);
 
-  BKE_brush_init(brush);
+  brush_init_data(&brush->id);
 
   brush->ob_mode = ob_mode;
 
@@ -698,47 +813,6 @@ struct Brush *BKE_brush_first_search(struct Main *bmain, const eObjectMode ob_mo
   return NULL;
 }
 
-/**
- * Only copy internal data of Brush ID from source
- * to already allocated/initialized destination.
- * You probably never want to use that directly,
- * use #BKE_id_copy or #BKE_id_copy_ex for typical needs.
- *
- * WARNING! This function will not handle ID user count!
- *
- * \param flag: Copying options (see BKE_lib_id.h's LIB_ID_COPY_... flags for more).
- */
-void BKE_brush_copy_data(Main *UNUSED(bmain),
-                         Brush *brush_dst,
-                         const Brush *brush_src,
-                         const int flag)
-{
-  if (brush_src->icon_imbuf) {
-    brush_dst->icon_imbuf = IMB_dupImBuf(brush_src->icon_imbuf);
-  }
-
-  if ((flag & LIB_ID_COPY_NO_PREVIEW) == 0) {
-    BKE_previewimg_id_copy(&brush_dst->id, &brush_src->id);
-  }
-  else {
-    brush_dst->preview = NULL;
-  }
-
-  brush_dst->curve = BKE_curvemapping_copy(brush_src->curve);
-  if (brush_src->gpencil_settings != NULL) {
-    brush_dst->gpencil_settings = MEM_dupallocN(brush_src->gpencil_settings);
-    brush_dst->gpencil_settings->curve_sensitivity = BKE_curvemapping_copy(
-        brush_src->gpencil_settings->curve_sensitivity);
-    brush_dst->gpencil_settings->curve_strength = BKE_curvemapping_copy(
-        brush_src->gpencil_settings->curve_strength);
-    brush_dst->gpencil_settings->curve_jitter = BKE_curvemapping_copy(
-        brush_src->gpencil_settings->curve_jitter);
-  }
-
-  /* enable fake user by default */
-  id_fake_user_set(&brush_dst->id);
-}
-
 Brush *BKE_brush_copy(Main *bmain, const Brush *brush)
 {
   Brush *brush_copy;
@@ -746,70 +820,6 @@ Brush *BKE_brush_copy(Main *bmain, const Brush *brush)
   return brush_copy;
 }
 
-/** Free (or release) any data used by this brush (does not free the brush itself). */
-void BKE_brush_free(Brush *brush)
-{
-  if (brush->icon_imbuf) {
-    IMB_freeImBuf(brush->icon_imbuf);
-  }
-  BKE_curvemapping_free(brush->curve);
-
-  if (brush->gpencil_settings != NULL) {
-    BKE_curvemapping_free(brush->gpencil_settings->curve_sensitivity);
-    BKE_curvemapping_free(brush->gpencil_settings->curve_strength);
-    BKE_curvemapping_free(brush->gpencil_settings->curve_jitter);
-    MEM_SAFE_FREE(brush->gpencil_settings);
-  }
-
-  MEM_SAFE_FREE(brush->gradient);
-
-  BKE_previewimg_free(&(brush->preview));
-}
-
-void BKE_brush_make_local(Main *bmain, Brush *brush, const int flags)
-{
-  const bool lib_local = (flags & LIB_ID_MAKELOCAL_FULL_LIBRARY) != 0;
-  bool is_local = false, is_lib = false;
-
-  /* - only lib users: do nothing (unless force_local is set)
-   * - only local users: set flag
-   * - mixed: make copy
-   */
-
-  if (!ID_IS_LINKED(brush)) {
-    return;
-  }
-
-  if (brush->clone.image) {
-    /* Special case: ima always local immediately. Clone image should only have one user anyway. */
-    BKE_lib_id_make_local(bmain, &brush->clone.image->id, false, 0);
-  }
-
-  BKE_library_ID_test_usages(bmain, brush, &is_local, &is_lib);
-
-  if (lib_local || is_local) {
-    if (!is_lib) {
-      BKE_lib_id_clear_library_data(bmain, &brush->id);
-      BKE_lib_id_expand_local(bmain, &brush->id);
-
-      /* enable fake user by default */
-      id_fake_user_set(&brush->id);
-    }
-    else {
-      Brush *brush_new = BKE_brush_copy(bmain, brush); /* Ensures FAKE_USER is set */
-
-      brush_new->id.us = 0;
-
-      /* setting newid is mandatory for complex make_lib_local logic... */
-      ID_NEW_SET(brush, brush_new);
-
-      if (!lib_local) {
-        BKE_libblock_remap(bmain, brush, brush_new, ID_REMAP_SKIP_INDIRECT_USAGE);
-      }
-    }
-  }
-}
-
 void BKE_brush_debug_print_state(Brush *br)
 {
   /* create a fake brush and set it to the defaults */

source/blender/blenkernel/intern/idtype.c

@@ -75,7 +75,7 @@ static void id_type_init(void)
   // INIT_TYPE(ID_AR);
   // INIT_TYPE(ID_AC);
   // INIT_TYPE(ID_NT);
-  // INIT_TYPE(ID_BR);
+  INIT_TYPE(ID_BR);
   // INIT_TYPE(ID_PA);
   // INIT_TYPE(ID_GD);
   // INIT_TYPE(ID_WM);

source/blender/blenkernel/intern/lib_id.c

@@ -560,9 +560,7 @@ bool BKE_lib_id_make_local(Main *bmain, ID *id, const bool test, const int flags
       }
       return true;
     case ID_BR:
-      if (!test) {
+      BLI_assert(0);
-        BKE_brush_make_local(bmain, (Brush *)id, flags);
-      }
       return true;
     case ID_PA:
       if (!test) {
@@ -778,7 +776,7 @@ bool BKE_id_copy_ex(Main *bmain, const ID *id, ID **r_newid, const int flag)
         BKE_node_tree_copy_data(bmain, (bNodeTree *)*r_newid, (bNodeTree *)id, flag);
         break;
       case ID_BR:
-        BKE_brush_copy_data(bmain, (Brush *)*r_newid, (Brush *)id, flag);
+        BLI_assert(0);
         break;
       case ID_PA:
         BKE_particlesettings_copy_data(
@@ -1405,7 +1403,7 @@ void BKE_libblock_init_empty(ID *id)
       ntreeInitDefault((bNodeTree *)id);
       break;
     case ID_BR:
-      BKE_brush_init((Brush *)id);
+      BLI_assert(0);
       break;
     case ID_PA:
       /* Nothing to do. */

source/blender/blenkernel/intern/lib_id_delete.c

@@ -212,7 +212,7 @@ void BKE_libblock_free_datablock(ID *id, const int UNUSED(flag))
       ntreeFreeTree((bNodeTree *)id);
       break;
     case ID_BR:
-      BKE_brush_free((Brush *)id);
+      BLI_assert(0);
       break;
     case ID_PA:
       BKE_particlesettings_free((ParticleSettings *)id);