Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Depsgraph: Use operation code for armature evaluation

Browse Source
This commit is contained in:
Sergey Sharybin
2019-02-01 10:56:01 +01:00
parent 4a30674102
commit 0d2dfd2e2d
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
View File

@@ -1415,8 +1415,7 @@ void DepsgraphNodeBuilder::build_armature(bArmature *armature)
add_operation_node(&armature->id, add_operation_node(&armature->id,
NodeType::PARAMETERS, NodeType::PARAMETERS,
NULL, NULL,
OperationCode::PLACEHOLDER, OperationCode::ARMATURE_EVAL);
"Armature Eval");
} }
void DepsgraphNodeBuilder::build_camera(Camera *camera) void DepsgraphNodeBuilder::build_camera(Camera *camera)

3
source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc
View File

@@ -343,8 +343,7 @@ void DepsgraphRelationBuilder::build_rig(Object *object)
build_armature(armature); build_armature(armature);
OperationKey armature_key(&armature->id, OperationKey armature_key(&armature->id,
NodeType::PARAMETERS, NodeType::PARAMETERS,
OperationCode::PLACEHOLDER, OperationCode::ARMATURE_EVAL);
"Armature Eval");
add_relation(armature_key, pose_init_key, "Data dependency"); add_relation(armature_key, pose_init_key, "Data dependency");
/* IK Solvers. /* IK Solvers.
* *

1
source/blender/depsgraph/intern/node/deg_node_operation.cc
View File

@@ -71,6 +71,7 @@ const char *operationCodeAsString(OperationCode opcode)
/* Object data. */ /* Object data. */
case OperationCode::LIGHT_PROBE_EVAL: return "LIGHT_PROBE_EVAL"; case OperationCode::LIGHT_PROBE_EVAL: return "LIGHT_PROBE_EVAL";
case OperationCode::SPEAKER_EVAL: return "SPEAKER_EVAL"; case OperationCode::SPEAKER_EVAL: return "SPEAKER_EVAL";
case OperationCode::ARMATURE_EVAL: return "ARMATURE_EVAL";
/* Pose. */ /* Pose. */
case OperationCode::POSE_INIT: return "POSE_INIT"; case OperationCode::POSE_INIT: return "POSE_INIT";
case OperationCode::POSE_INIT_IK: return "POSE_INIT_IK"; case OperationCode::POSE_INIT_IK: return "POSE_INIT_IK";

1
source/blender/depsgraph/intern/node/deg_node_operation.h
View File

@@ -98,6 +98,7 @@ enum class OperationCode {
/* Object data. --------------------------------------------------------- */ /* Object data. --------------------------------------------------------- */
LIGHT_PROBE_EVAL, LIGHT_PROBE_EVAL,
SPEAKER_EVAL, SPEAKER_EVAL,
ARMATURE_EVAL,
/* Pose. ---------------------------------------------------------------- */ /* Pose. ---------------------------------------------------------------- */
/* Init pose, clear flags, etc. */ /* Init pose, clear flags, etc. */