3 files changed, 27 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_layer_types.h b/source/blender/makesdna/DNA_layer_types.h
index 7b6fe3773f8..d5f7e25bb80 100644
--- a/source/blender/makesdna/DNA_layer_types.h
+++ b/source/blender/makesdna/DNA_layer_types.h
@@ -124,6 +124,21 @@ typedef struct ViewLayerAOV {
    * matches `eViewLayerAOVType` */
   int type;
 } ViewLayerAOV;
+
+/* Lightgroup Renderpass definition. */
+typedef struct ViewLayerLightgroup {
+  struct ViewLayerLightgroup *next, *prev;
+
+  /* Name of the Lightgroup */
+  char name[64];
+} ViewLayerLightgroup;
+
+/* Lightgroup membership information. */
+typedef struct LightgroupMembership {
+  /* Name of the Lightgroup */
+  char name[64];
+} LightgroupMembership;
+
 typedef struct ViewLayer {
   struct ViewLayer *next, *prev;
   /** MAX_NAME. */
@@ -164,6 +179,10 @@ typedef struct ViewLayer {
   ListBase aovs;
   ViewLayerAOV *active_aov;
 
+  /* List containing the 'ViewLayerLightgroup`s */
+  ListBase lightgroups;
+  ViewLayerLightgroup *active_lightgroup;
+
   /* Runtime data */
   /** ViewLayerEngineData. */
   ListBase drawdata;
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index 30f80110f6e..54627e711ff 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -31,6 +31,7 @@ struct Curve;
 struct FluidsimSettings;
 struct GeometrySet;
 struct Ipo;
+struct LightgroupMembership;
 struct Material;
 struct Mesh;
 struct Object;
@@ -434,8 +435,10 @@ typedef struct Object {
 
   ObjectLineArt lineart;
 
+  /** Lightgroup membership information. */
+  struct LightgroupMembership *lightgroup;
+
   /** Runtime evaluation data (keep last). */
-  void *_pad9;
   Object_Runtime runtime;
 } Object;
 
diff --git a/source/blender/makesdna/DNA_world_types.h b/source/blender/makesdna/DNA_world_types.h
index 497b99eb04d..88f2e0c9407 100644
--- a/source/blender/makesdna/DNA_world_types.h
+++ b/source/blender/makesdna/DNA_world_types.h
@@ -16,6 +16,7 @@ extern "C" {
 
 struct AnimData;
 struct Ipo;
+struct LightgroupMembership;
 struct bNodeTree;
 
 #ifndef MAX_MTEX
@@ -70,6 +71,9 @@ typedef struct World {
   /* nodes */
   struct bNodeTree *nodetree;
 
+  /* Lightgroup membership information. */
+  struct LightgroupMembership *lightgroup;
+
   /** Runtime. */
   ListBase gpumaterial;
 } World;