Layers: use IDProperty and override collection properties system

First this replace a custom data struct with IDProperty, and use
IDProperty group merge and copying functions. Which means that a collection
property setting is only created if necessary.

This implements the "Layer Collection settings" override system, as
suggested in the "Override Manifesto" document.

The core is working, with Scene, LayerCollection and Object using a
single IDProperty to store all the render settings data. Next step is to
migrate this to depsgraph.

Note: Clay engine "ssao_samples" was hardcoded to 32 for now. It will come
back as part of "Workspace Settings" later.

Many thanks for Bastien Montagne for the help with the UI template
nightmare ;)

Differential Revision: https://developer.blender.org/D2563

1 files changed, 1 insertions, 2 deletions

diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index fb0a02e92ae..59ed6f1222f 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -46,7 +46,6 @@ struct Object;
 struct AnimData;
 struct Ipo;
 struct BoundBox;
-struct CollectionEngineSettings;
 struct Path;
 struct Material;
 struct PartDeflect;
@@ -304,7 +303,7 @@ typedef struct Object {
 
 	struct PreviewImage *preview;
 
-	ListBase collection_settings; /* used by depsgraph, flushed from collection-tree */
+	struct IDProperty *collection_properties; /* used by depsgraph, flushed from collection-tree */
 } Object;
 
 /* Warning, this is not used anymore because hooks are now modifiers */