Refactor: Move brush foreach_id to new IDTypeInfo structure.

1 files changed, 4 insertions, 19 deletions

diff --git a/source/blender/blenkernel/intern/lib_query.c b/source/blender/blenkernel/intern/lib_query.c
index 71bf065d855..d922c5dd24c 100644
--- a/source/blender/blenkernel/intern/lib_query.c
+++ b/source/blender/blenkernel/intern/lib_query.c
@@ -81,6 +81,7 @@
 #include "BKE_rigidbody.h"
 #include "BKE_sequencer.h"
 #include "BKE_shader_fx.h"
+#include "BKE_texture.h"
 #include "BKE_workspace.h"
 
 #define FOREACH_FINALIZE _finalize
@@ -318,14 +319,6 @@ static void library_foreach_animationData(LibraryForeachIDData *data, AnimData *
   FOREACH_FINALIZE_VOID;
 }
 
-static void library_foreach_mtex(LibraryForeachIDData *data, MTex *mtex)
-{
-  FOREACH_CALLBACK_INVOKE(data, mtex->object, IDWALK_CB_NOP);
-  FOREACH_CALLBACK_INVOKE(data, mtex->tex, IDWALK_CB_USER);
-
-  FOREACH_FINALIZE_VOID;
-}
-
 static void library_foreach_paint(LibraryForeachIDData *data, Paint *paint)
 {
   FOREACH_CALLBACK_INVOKE(data, paint->brush, IDWALK_CB_USER);
@@ -964,15 +957,7 @@ static void library_foreach_ID_link(Main *bmain,
       }
 
       case ID_BR: {
-        Brush *brush = (Brush *)id;
-        CALLBACK_INVOKE(brush->toggle_brush, IDWALK_CB_NOP);
-        CALLBACK_INVOKE(brush->clone.image, IDWALK_CB_NOP);
-        CALLBACK_INVOKE(brush->paint_curve, IDWALK_CB_USER);
-        if (brush->gpencil_settings) {
-          CALLBACK_INVOKE(brush->gpencil_settings->material, IDWALK_CB_USER);
-        }
-        library_foreach_mtex(&data, &brush->mtex);
-        library_foreach_mtex(&data, &brush->mask_mtex);
+        BLI_assert(0);
         break;
       }
 
@@ -985,7 +970,7 @@ static void library_foreach_ID_link(Main *bmain,
 
         for (i = 0; i < MAX_MTEX; i++) {
           if (psett->mtex[i]) {
-            library_foreach_mtex(&data, psett->mtex[i]);
+            BKE_texture_mtex_foreach_id(&data, psett->mtex[i]);
           }
         }
 
@@ -1063,7 +1048,7 @@ static void library_foreach_ID_link(Main *bmain,
 
         for (i = 0; i < MAX_MTEX; i++) {
           if (linestyle->mtex[i]) {
-            library_foreach_mtex(&data, linestyle->mtex[i]);
+            BKE_texture_mtex_foreach_id(&data, linestyle->mtex[i]);
           }
         }
         if (linestyle->nodetree) {