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:
authorSergey Sharybin <sergey@blender.org>2020-09-18 17:57:33 +0300
committerSergey Sharybin <sergey@blender.org>2020-09-21 13:25:45 +0300
commit216a2218768d005c18032df370c19c1c0f571797 (patch)
tree20ec81038b82e567fc67f225bc1f7057dcaccb1f /source/blender/depsgraph
parent3791dbea1e796f96440437333e4318066f26bde2 (diff)
Implement ID properties support for TimeMarker
Allows scripters to store additional information in the marker itself instead of using work-around approach based on marker names and such. Differential Revision: https://developer.blender.org/D8944
Diffstat (limited to 'source/blender/depsgraph')
-rw-r--r--source/blender/depsgraph/intern/builder/deg_builder_nodes_scene.cc4
-rw-r--r--source/blender/depsgraph/intern/builder/deg_builder_relations_scene.cc4
2 files changed, 8 insertions, 0 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes_scene.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes_scene.cc
index ee40fa3f5c8..fd457e0b2bf 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes_scene.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes_scene.cc
@@ -71,6 +71,10 @@ void DepsgraphNodeBuilder::build_scene_parameters(Scene *scene)
* in when building scene from view layer, so this particular case does not make things
* marginally worse. */
build_scene_compositor(scene);
+
+ LISTBASE_FOREACH (TimeMarker *, marker, &scene->markers) {
+ build_idproperties(marker->prop);
+ }
}
void DepsgraphNodeBuilder::build_scene_compositor(Scene *scene)
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations_scene.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations_scene.cc
index 6ebf5210b63..703c6c7cd68 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations_scene.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_scene.cc
@@ -59,6 +59,10 @@ void DepsgraphRelationBuilder::build_scene_parameters(Scene *scene)
&scene->id, NodeType::PARAMETERS, OperationCode::PARAMETERS_EXIT);
OperationKey scene_eval_key(&scene->id, NodeType::PARAMETERS, OperationCode::SCENE_EVAL);
add_relation(parameters_eval_key, scene_eval_key, "Parameters -> Scene Eval");
+
+ LISTBASE_FOREACH (TimeMarker *, marker, &scene->markers) {
+ build_idproperties(marker->prop);
+ }
}
void DepsgraphRelationBuilder::build_scene_compositor(Scene *scene)