4 files changed, 139 insertions, 0 deletions

diff --git a/source/blender/makesdna/DNA_layer_types.h b/source/blender/makesdna/DNA_layer_types.h
index 6f6c6d7d145..3a4293c8ad8 100644
--- a/source/blender/makesdna/DNA_layer_types.h
+++ b/source/blender/makesdna/DNA_layer_types.h
@@ -59,6 +59,7 @@ typedef struct LayerCollection {
 	ListBase object_bases;      /* (ObjectBase *)LinkData->data - synced with collection->objects and collection->filter_objects */
 	ListBase overrides;
 	ListBase layer_collections; /* synced with collection->collections */
+	ListBase engine_settings; /* CollectionEngineSettings */
 } LayerCollection;
 
 typedef struct SceneLayer {
@@ -102,8 +103,54 @@ enum {
 /* SceneLayer->flag */
 enum {
 	SCENE_LAYER_RENDER = (1 << 0),
+	SCENE_LAYER_ENGINE_DIRTY  = (1 << 1),
 };
 
+
+/* *************************************************************** */
+/* Engine Settings */
+
+typedef struct CollectionEngineProperty {
+	struct CollectionEngineProperty *next, *prev;
+	char name[64]; /* MAX_NAME */
+	short type;
+	short pad;
+	char flag;
+	char pad2[3];
+} CollectionEngineProperty;
+
+typedef struct CollectionEnginePropertyInt {
+  struct CollectionEngineProperty data;
+  int value;
+  int pad;
+} CollectionEnginePropertyInt;
+
+typedef struct CollectionEnginePropertyFloat {
+  struct CollectionEngineProperty data;
+  float value;
+  float pad;
+} CollectionEnginePropertyFloat;
+
+typedef struct CollectionEngineSettings {
+	struct CollectionEngineSettings *next, *prev;
+	char name[32]; /* engine name - MAX_NAME */
+	ListBase properties; /* CollectionProperty */
+} CollectionEngineSettings;
+
+/* CollectionEngineProperty->flag */
+enum {
+	COLLECTION_PROP_USE = (1 << 0),
+};
+
+/* CollectionEntineProperty.type */
+typedef enum CollectionEnginePropertyType {
+	COLLECTION_PROP_TYPE_FLOAT = 0,
+	COLLECTION_PROP_TYPE_INT = 1,
+} CollectionEnginePropertyType;
+
+/* *************************************************************** */
+
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h
index 0c500e366a7..bd8278f897a 100644
--- a/source/blender/makesdna/DNA_material_types.h
+++ b/source/blender/makesdna/DNA_material_types.h
@@ -90,6 +90,43 @@ typedef struct TexPaintSlot {
 	int pad;
 } TexPaintSlot;
 
+/* Material Engine Settings */
+typedef struct MaterialEngineSettings {
+	struct MaterialEngineSettings *next, *prev;
+	char name[32]; /* engine name - MAX_NAME */
+	void *data;
+} MaterialEngineSettings;
+
+/* Clay engine */
+
+/* MaterialRuntimeClay.flag */
+#define CLAY_OUTDATED		1
+
+typedef struct MaterialEngineSettingsClay {
+	short type;
+	short matcap_icon; /* Icon ID */
+
+	float matcap_rot;
+	float matcap_hue;
+	float matcap_sat;
+	float matcap_val;
+
+	float ssao_distance;
+	float ssao_attenuation;
+	float ssao_factor_cavity;
+	float ssao_factor_edge;
+
+	/* Runtime */
+	short flag;
+	short pad;
+	int ubo_index;
+} MaterialEngineSettingsClay;
+
+/* MaterialEngineSettingsClay.type */
+#define CLAY_MATCAP_NONE		0
+#define CLAY_MATCAP_SIMPLE		1
+#define CLAY_MATCAP_COMPLETE	2
+
 typedef struct Material {
 	ID id;
 	struct AnimData *adt;	/* animation data (must be immediately after id for utilities to use it) */ 
@@ -203,6 +240,9 @@ typedef struct Material {
 
 	struct TexPaintSlot *texpaintslot; /* cached slot for painting. Make sure to recalculate before use
 	                                    * with refresh_texpaint_image_cache */
+	/* Engine Settings */
+	ListBase engines_settings; /* MaterialEngineSettings */
+
 	ListBase gpumaterial;		/* runtime */
 } Material;
 
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index 60aaa4ace20..080ade57c0d 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -46,6 +46,7 @@ struct Object;
 struct AnimData;
 struct Ipo;
 struct BoundBox;
+struct CollectionSettings;
 struct Path;
 struct Material;
 struct PartDeflect;
@@ -302,6 +303,8 @@ typedef struct Object {
 	LodLevel *currentlod;
 
 	struct PreviewImage *preview;
+
+	struct ListBase *collection_settings; /* used by depsgraph, flushed from collection-tree */
 } Object;
 
 /* Warning, this is not used anymore because hooks are now modifiers */
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index ba5e50ec441..6e56824b176 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -48,6 +48,7 @@ extern "C" {
 #include "DNA_freestyle_types.h"
 #include "DNA_gpu_types.h"
 #include "DNA_layer_types.h"
+#include "DNA_material_types.h"
 #include "DNA_userdef_types.h"
 
 struct CurveMapping;
@@ -539,6 +540,50 @@ typedef enum BakePassFilter {
 #define R_BAKE_PASS_FILTER_ALL (~0)
 
 /* *************************************************************** */
+/* Engine Settings */
+
+typedef struct RenderEngineSettings {
+	struct RenderEngineSettings *next, *prev;
+	char name[32]; /* engine name */
+	void *data;
+} RenderEngineSettings;
+
+/* Render Data */
+typedef struct RenderEngineSettingsClay {
+	/* Use same layout as MaterialEngineSettingsClay so this struct
+	 * can be used as Material Settings. */
+	short type;
+	short matcap_icon; /* Icon ID */
+
+	float matcap_rot;
+	float matcap_hue;
+	float matcap_sat;
+	float matcap_val;
+
+	float ssao_distance;
+	float ssao_attenuation;
+	float ssao_factor_cavity;
+	float ssao_factor_edge;
+
+	short flag;
+	short pad;
+	int ubo_index;
+	/* end of MaterialEngineSettingsClay */
+
+	/* Global Settings */
+	short options;
+	short pad1;
+	int ssao_samples;
+	int pad2[2];
+} RenderEngineSettingsClay;
+
+/* RenderEngineSettingsClay.options */
+typedef enum ClayFlagSettings {
+	CLAY_USE_AO     = (1 << 0),
+	CLAY_USE_HSV    = (1 << 1),
+} ClayFlagSettings;
+
+/* *************************************************************** */
 /* Render Data */
 
 typedef struct RenderData {
@@ -1707,6 +1752,9 @@ typedef struct Scene {
 	struct SceneCollection *collection;
 	int active_layer;
 	int pad4;
+
+	ListBase engines_settings; /* RenderEngineSettings */
+	int pad5[2];
 } Scene;
 
 /* **************** RENDERDATA ********************* */
@@ -1895,6 +1943,7 @@ enum {
 /* scene->r.engine (scene.c) */
 extern const char *RE_engine_id_BLENDER_RENDER;
 extern const char *RE_engine_id_BLENDER_GAME;
+extern const char *RE_engine_id_BLENDER_CLAY;
 extern const char *RE_engine_id_CYCLES;
 
 /* **************** SCENE ********************* */