[Bf-blender-cvs] [13d0f74b807] master: Refactor: Move lamp foreach_id to new IDTypeInfo structure.

[Bastien Montagne]

Commit: 13d0f74b8076a77dc1ea5725739f167128932312
Author: Bastien Montagne
Date:   Tue May 12 18:54:38 2020 +0200
Branches: master
https://developer.blender.org/rB13d0f74b8076a77dc1ea5725739f167128932312

Refactor: Move lamp foreach_id to new IDTypeInfo structure.

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

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

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

diff --git a/source/blender/blenkernel/intern/lib_query.c b/source/blender/blenkernel/intern/lib_query.c
index a890e26ecc3..8c29209f29d 100644
--- a/source/blender/blenkernel/intern/lib_query.c
+++ b/source/blender/blenkernel/intern/lib_query.c
@@ -925,11 +925,7 @@ static void library_foreach_ID_link(Main *bmain,
       }
 
       case ID_LA: {
-        Light *lamp = (Light *)id;
-        if (lamp->nodetree) {
-          /* nodetree **are owned by IDs**, treat them as mere sub-data and not real ID! */
-          BKE_library_foreach_ID_embedded(&data, (ID **)&lamp->nodetree);
-        }
+        BLI_assert(0);
         break;
       }
 
diff --git a/source/blender/blenkernel/intern/light.c b/source/blender/blenkernel/intern/light.c
index 13f4815124b..9dc338ce580 100644
--- a/source/blender/blenkernel/intern/light.c
+++ b/source/blender/blenkernel/intern/light.c
@@ -41,6 +41,7 @@
 #include "BKE_icons.h"
 #include "BKE_idtype.h"
 #include "BKE_lib_id.h"
+#include "BKE_lib_query.h"
 #include "BKE_light.h"
 #include "BKE_main.h"
 #include "BKE_node.h"
@@ -107,6 +108,15 @@ static void light_free_data(ID *id)
   la->id.icon_id = 0;
 }
 
+static void light_foreach_id(ID *id, LibraryForeachIDData *data)
+{
+  Light *lamp = (Light *)id;
+  if (lamp->nodetree) {
+    /* nodetree **are owned by IDs**, treat them as mere sub-data and not real ID! */
+    BKE_library_foreach_ID_embedded(data, (ID **)&lamp->nodetree);
+  }
+}
+
 IDTypeInfo IDType_ID_LA = {
     .id_code = ID_LA,
     .id_filter = FILTER_ID_LA,
@@ -121,6 +131,7 @@ IDTypeInfo IDType_ID_LA = {
     .copy_data = light_copy_data,
     .free_data = light_free_data,
     .make_local = NULL,
+    .foreach_id = light_foreach_id,
 };
 
 Light *BKE_light_add(Main *bmain, const char *name)