Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDalai Felinto <dfelinto@gmail.com>2017-02-07 18:54:09 +0300
committerDalai Felinto <dfelinto@gmail.com>2017-02-07 18:54:09 +0300
commit6432c8cc002cb7391e2ac5eae3c300fed28fc422 (patch)
tree10005610d94a4e23b305d1661d9be72795c7f563 /source/blender/makesdna
parent6bf9c8ac8918a6656c20cca2c08f20b38e90980c (diff)
Layers: get/update CollectionEngineSettings (depsgraph placeholder)
Every time: * A collection settings is set * A collection visibility changes * An object is added/removed/ ... We need to recalculate the "accumulated" CollectionEngineSettings that the render engine should use for an object. This is to be handled by the depsgraph. Meanwhile this code should allow us to start using those settings in the render engines. Note: We are storing this in the objects, which means we can only have one active calculated option every time. This is intended to get the conversation with the Depsgraph department going.
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r--source/blender/makesdna/DNA_layer_types.h1
-rw-r--r--source/blender/makesdna/DNA_object_types.h4
2 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_layer_types.h b/source/blender/makesdna/DNA_layer_types.h
index 3a4293c8ad8..bd456b526c7 100644
--- a/source/blender/makesdna/DNA_layer_types.h
+++ b/source/blender/makesdna/DNA_layer_types.h
@@ -91,6 +91,7 @@ enum {
BASE_VISIBLED = (1 << 1),
BASE_SELECTABLED = (1 << 2),
BASE_FROMDUPLI = (1 << 3),
+ BASE_DIRTY_ENGINE_SETTINGS = (1 << 4),
};
/* LayerCollection->flag */
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index 080ade57c0d..b92d2cd1573 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -46,7 +46,7 @@ struct Object;
struct AnimData;
struct Ipo;
struct BoundBox;
-struct CollectionSettings;
+struct CollectionEngineSettings;
struct Path;
struct Material;
struct PartDeflect;
@@ -304,7 +304,7 @@ typedef struct Object {
struct PreviewImage *preview;
- struct ListBase *collection_settings; /* used by depsgraph, flushed from collection-tree */
+ struct CollectionEngineSettings *collection_settings; /* used by depsgraph, flushed from collection-tree */
} Object;
/* Warning, this is not used anymore because hooks are now modifiers */