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.vfx@gmail.com>2017-10-25 12:45:31 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2017-10-25 12:45:31 +0300
commit6ec8344243e6935281120a504b5a3355d2b3620a (patch)
tree7f9aa3f71fae0064a757cf2e5021beebbce3ae2e /source/blender/depsgraph
parenteb090d06092701683d073fa041e64077b61b810c (diff)
Depsgraph: Add missing movie clip dopesheet invalidation
Diffstat (limited to 'source/blender/depsgraph')
-rw-r--r--source/blender/depsgraph/intern/builder/deg_builder_nodes.cc6
-rw-r--r--source/blender/depsgraph/intern/depsgraph_type_defines.cc2
-rw-r--r--source/blender/depsgraph/intern/depsgraph_types.h5
3 files changed, 12 insertions, 1 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index 77f4e5b2dd1..0228e619f54 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@ -86,6 +86,7 @@ extern "C" {
#include "BKE_mesh.h"
#include "BKE_mball.h"
#include "BKE_modifier.h"
+#include "BKE_movieclip.h"
#include "BKE_node.h"
#include "BKE_object.h"
#include "BKE_particle.h"
@@ -1112,6 +1113,11 @@ void DepsgraphNodeBuilder::build_movieclip(MovieClip *clip) {
ID *clip_id = &clip->id;
/* Animation. */
build_animdata(clip_id);
+ /* Movie clip evaluation. */
+ add_operation_node(clip_id,
+ DEG_NODE_TYPE_PARAMETERS,
+ function_bind(BKE_movieclip_eval_update, _1, clip),
+ DEG_OPCODE_MOVIECLIP_EVAL);
}
} // namespace DEG
diff --git a/source/blender/depsgraph/intern/depsgraph_type_defines.cc b/source/blender/depsgraph/intern/depsgraph_type_defines.cc
index 96d68f4e024..e5bdaf79366 100644
--- a/source/blender/depsgraph/intern/depsgraph_type_defines.cc
+++ b/source/blender/depsgraph/intern/depsgraph_type_defines.cc
@@ -139,6 +139,8 @@ static const char *stringify_opcode(eDepsOperation_Code opcode)
STRINGIFY_OPCODE(MASK_EVAL);
/* Shading. */
STRINGIFY_OPCODE(SHADING);
+ /* Movie clip. */
+ STRINGIFY_OPCODE(MOVIECLIP_EVAL);
case DEG_NUM_OPCODES: return "SpecialCase";
#undef STRINGIFY_OPCODE
diff --git a/source/blender/depsgraph/intern/depsgraph_types.h b/source/blender/depsgraph/intern/depsgraph_types.h
index e43b79a0361..03d98c85148 100644
--- a/source/blender/depsgraph/intern/depsgraph_types.h
+++ b/source/blender/depsgraph/intern/depsgraph_types.h
@@ -210,10 +210,13 @@ typedef enum eDepsOperation_Code {
/* Shading. ------------------------------------------- */
DEG_OPCODE_SHADING,
- /* Masks ------------------------------------------- */
+ /* Masks. ------------------------------------------ */
DEG_OPCODE_MASK_ANIMATION,
DEG_OPCODE_MASK_EVAL,
+ /* Movie clips. ------------------------------------ */
+ DEG_OPCODE_MOVIECLIP_EVAL,
+
DEG_NUM_OPCODES,
} eDepsOperation_Code;