[Bf-blender-cvs] [c44d6fb9873] master: Refactor: Move movieclip foreach_id to new IDTypeInfo structure.

[Bastien Montagne]

Commit: c44d6fb9873578e80055d41f687f959c79c274e1
Author: Bastien Montagne
Date:   Fri May 15 18:29:50 2020 +0200
Branches: master
https://developer.blender.org/rBc44d6fb9873578e80055d41f687f959c79c274e1

Refactor: Move movieclip foreach_id to new IDTypeInfo structure.

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

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

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

diff --git a/source/blender/blenkernel/intern/lib_query.c b/source/blender/blenkernel/intern/lib_query.c
index b572d7c7e8b..9ab8ceb6512 100644
--- a/source/blender/blenkernel/intern/lib_query.c
+++ b/source/blender/blenkernel/intern/lib_query.c
@@ -967,23 +967,7 @@ static void library_foreach_ID_link(Main *bmain,
       }
 
       case ID_MC: {
-        MovieClip *clip = (MovieClip *)id;
-        MovieTracking *tracking = &clip->tracking;
-
-        CALLBACK_INVOKE(clip->gpd, IDWALK_CB_USER);
-
-        LISTBASE_FOREACH (MovieTrackingTrack *, track, &tracking->tracks) {
-          CALLBACK_INVOKE(track->gpd, IDWALK_CB_USER);
-        }
-        LISTBASE_FOREACH (MovieTrackingObject *, object, &tracking->objects) {
-          LISTBASE_FOREACH (MovieTrackingTrack *, track, &object->tracks) {
-            CALLBACK_INVOKE(track->gpd, IDWALK_CB_USER);
-          }
-        }
-
-        LISTBASE_FOREACH (MovieTrackingPlaneTrack *, plane_track, &tracking->plane_tracks) {
-          CALLBACK_INVOKE(plane_track->image, IDWALK_CB_USER);
-        }
+        BLI_assert(0);
         break;
       }
 
diff --git a/source/blender/blenkernel/intern/movieclip.c b/source/blender/blenkernel/intern/movieclip.c
index 4c7b791f103..fe7c2055aef 100644
--- a/source/blender/blenkernel/intern/movieclip.c
+++ b/source/blender/blenkernel/intern/movieclip.c
@@ -36,6 +36,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "DNA_constraint_types.h"
+#include "DNA_gpencil_types.h"
 #include "DNA_movieclip_types.h"
 #include "DNA_node_types.h"
 #include "DNA_object_types.h"
@@ -58,6 +59,7 @@
 #include "BKE_idtype.h"
 #include "BKE_image.h" /* openanim */
 #include "BKE_lib_id.h"
+#include "BKE_lib_query.h"
 #include "BKE_main.h"
 #include "BKE_movieclip.h"
 #include "BKE_node.h"
@@ -106,6 +108,27 @@ static void movie_clip_free_data(ID *id)
   BKE_tracking_free(&movie_clip->tracking);
 }
 
+static void movie_clip_foreach_id(ID *id, LibraryForeachIDData *data)
+{
+  MovieClip *movie_clip = (MovieClip *)id;
+  MovieTracking *tracking = &movie_clip->tracking;
+
+  BKE_LIB_FOREACHID_PROCESS(data, movie_clip->gpd, IDWALK_CB_USER);
+
+  LISTBASE_FOREACH (MovieTrackingTrack *, track, &tracking->tracks) {
+    BKE_LIB_FOREACHID_PROCESS(data, track->gpd, IDWALK_CB_USER);
+  }
+  LISTBASE_FOREACH (MovieTrackingObject *, object, &tracking->objects) {
+    LISTBASE_FOREACH (MovieTrackingTrack *, track, &object->tracks) {
+      BKE_LIB_FOREACHID_PROCESS(data, track->gpd, IDWALK_CB_USER);
+    }
+  }
+
+  LISTBASE_FOREACH (MovieTrackingPlaneTrack *, plane_track, &tracking->plane_tracks) {
+    BKE_LIB_FOREACHID_PROCESS(data, plane_track->image, IDWALK_CB_USER);
+  }
+}
+
 IDTypeInfo IDType_ID_MC = {
     .id_code = ID_MC,
     .id_filter = FILTER_ID_MC,
@@ -120,6 +143,7 @@ IDTypeInfo IDType_ID_MC = {
     .copy_data = movie_clip_copy_data,
     .free_data = movie_clip_free_data,
     .make_local = NULL,
+    .foreach_id = movie_clip_foreach_id,
 };
 
 /*********************** movieclip buffer loaders *************************/