Layers: Per-Collection edit mode settings

I didn't manage to get the proper object context in the collection
properties editor. That said I got it working for now in a temporary way
since this will change once we get workspaces anyways

(see changes in buttons_context.c and
rna_scene.c::rna_LayerCollection_mode_settings_get)

I still need to handle the merging of the settings. I will find a
provisory solution while we wait for depsgraph.

(also layer_collection_create_mode_settings_object and layer_collection_create_mode_settings_edit could probably be elsewhere - under draw/engines likely)

1 files changed, 11 insertions, 1 deletions

diff --git a/source/blender/makesdna/DNA_layer_types.h b/source/blender/makesdna/DNA_layer_types.h
index bd456b526c7..5d8bff3ef1d 100644
--- a/source/blender/makesdna/DNA_layer_types.h
+++ b/source/blender/makesdna/DNA_layer_types.h
@@ -60,6 +60,7 @@ typedef struct LayerCollection {
 	ListBase overrides;
 	ListBase layer_collections; /* synced with collection->collections */
 	ListBase engine_settings; /* CollectionEngineSettings */
+	ListBase mode_settings; /* CollectionModeSettings */
 } LayerCollection;
 
 typedef struct SceneLayer {
@@ -136,6 +137,8 @@ typedef struct CollectionEngineSettings {
 	struct CollectionEngineSettings *next, *prev;
 	char name[32]; /* engine name - MAX_NAME */
 	ListBase properties; /* CollectionProperty */
+	int type; /* CollectionEngineSettingsType */
+	int pad;
 } CollectionEngineSettings;
 
 /* CollectionEngineProperty->flag */
@@ -143,12 +146,19 @@ enum {
 	COLLECTION_PROP_USE = (1 << 0),
 };
 
-/* CollectionEntineProperty.type */
+/* CollectionEngineProperty.type */
 typedef enum CollectionEnginePropertyType {
 	COLLECTION_PROP_TYPE_FLOAT = 0,
 	COLLECTION_PROP_TYPE_INT = 1,
 } CollectionEnginePropertyType;
 
+/* CollectionEngineSettings->type */
+typedef enum CollectionEngineSettingsType {
+	COLLECTION_MODE_NONE = 0,
+	COLLECTION_MODE_OBJECT = 1,
+	COLLECTION_MODE_EDIT = 2,
+} CollectionModeSettingsType;
+
 /* *************************************************************** */