[Bf-blender-cvs] [8ce0c9111db] master: Refactor: Move texture foreach_id to new IDTypeInfo structure.

[Bastien Montagne]

Commit: 8ce0c9111db489854ba7c7b9110ea55f39f16c16
Author: Bastien Montagne
Date:   Tue May 12 18:46:57 2020 +0200
Branches: master
https://developer.blender.org/rB8ce0c9111db489854ba7c7b9110ea55f39f16c16

Refactor: Move texture foreach_id to new IDTypeInfo structure.

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

M	source/blender/blenkernel/intern/lib_query.c
M	source/blender/blenkernel/intern/texture.c

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

diff --git a/source/blender/blenkernel/intern/lib_query.c b/source/blender/blenkernel/intern/lib_query.c
index 7f28941738c..a890e26ecc3 100644
--- a/source/blender/blenkernel/intern/lib_query.c
+++ b/source/blender/blenkernel/intern/lib_query.c
@@ -915,12 +915,7 @@ static void library_foreach_ID_link(Main *bmain,
       }
 
       case ID_TE: {
-        Tex *texture = (Tex *)id;
-        if (texture->nodetree) {
-          /* nodetree **are owned by IDs**, treat them as mere sub-data and not real ID! */
-          BKE_library_foreach_ID_embedded(&data, (ID **)&texture->nodetree);
-        }
-        CALLBACK_INVOKE(texture->ima, IDWALK_CB_USER);
+        BLI_assert(0);
         break;
       }
 
diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c
index 0abee335036..49c5c073f49 100644
--- a/source/blender/blenkernel/intern/texture.c
+++ b/source/blender/blenkernel/intern/texture.c
@@ -57,6 +57,7 @@
 #include "BKE_image.h"
 #include "BKE_key.h"
 #include "BKE_lib_id.h"
+#include "BKE_lib_query.h"
 #include "BKE_material.h"
 #include "BKE_node.h"
 #include "BKE_scene.h"
@@ -123,6 +124,16 @@ static void texture_free_data(ID *id)
   BKE_previewimg_free(&texture->preview);
 }
 
+static void texture_foreach_id(ID *id, LibraryForeachIDData *data)
+{
+  Tex *texture = (Tex *)id;
+  if (texture->nodetree) {
+    /* nodetree **are owned by IDs**, treat them as mere sub-data and not real ID! */
+    BKE_library_foreach_ID_embedded(data, (ID **)&texture->nodetree);
+  }
+  BKE_LIB_FOREACHID_PROCESS(data, texture->ima, IDWALK_CB_USER);
+}
+
 IDTypeInfo IDType_ID_TE = {
     .id_code = ID_TE,
     .id_filter = FILTER_ID_TE,
@@ -137,6 +148,7 @@ IDTypeInfo IDType_ID_TE = {
     .copy_data = texture_copy_data,
     .free_data = texture_free_data,
     .make_local = NULL,
+    .foreach_id = texture_foreach_id,
 };
 
 /* ****************** Mapping ******************* */