diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-10-09 12:49:27 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-10-09 12:49:27 +0300 |
commit | a5b4b0f21c1ae8c96e4fea9abdcfac2fab1cf300 (patch) | |
tree | 0658d8bdfb8ec03652aa04f82ee8a4d243ec6370 /source/blender/depsgraph/intern/depsgraph_type_defines.cc | |
parent | d68f698cf0321477c0734474150eb4bc43c4e85f (diff) | |
parent | abcda06934aba054de8540b66b13c2bbc5f8f515 (diff) |
Merge branch '28' into custom-manipulatorscustom-manipulators
Diffstat (limited to 'source/blender/depsgraph/intern/depsgraph_type_defines.cc')
-rw-r--r-- | source/blender/depsgraph/intern/depsgraph_type_defines.cc | 33 |
1 files changed, 26 insertions, 7 deletions
diff --git a/source/blender/depsgraph/intern/depsgraph_type_defines.cc b/source/blender/depsgraph/intern/depsgraph_type_defines.cc index bb75a85eea4..0d42acf382a 100644 --- a/source/blender/depsgraph/intern/depsgraph_type_defines.cc +++ b/source/blender/depsgraph/intern/depsgraph_type_defines.cc @@ -98,36 +98,55 @@ static const char *stringify_opcode(eDepsOperation_Code opcode) { switch (opcode) { #define STRINGIFY_OPCODE(name) case DEG_OPCODE_##name: return #name + /* Generic Operations. */ STRINGIFY_OPCODE(OPERATION); + STRINGIFY_OPCODE(PARAMETERS_EVAL); STRINGIFY_OPCODE(PLACEHOLDER); + /* Animation, Drivers, etc. */ STRINGIFY_OPCODE(ANIMATION); STRINGIFY_OPCODE(DRIVER); + /* Transform. */ STRINGIFY_OPCODE(TRANSFORM_LOCAL); STRINGIFY_OPCODE(TRANSFORM_PARENT); STRINGIFY_OPCODE(TRANSFORM_CONSTRAINTS); + STRINGIFY_OPCODE(TRANSFORM_FINAL); + STRINGIFY_OPCODE(TRANSFORM_OBJECT_UBEREVAL); + /* Rigid body. */ STRINGIFY_OPCODE(RIGIDBODY_REBUILD); STRINGIFY_OPCODE(RIGIDBODY_SIM); - STRINGIFY_OPCODE(TRANSFORM_RIGIDBODY); - STRINGIFY_OPCODE(TRANSFORM_FINAL); - STRINGIFY_OPCODE(OBJECT_UBEREVAL); + STRINGIFY_OPCODE(RIGIDBODY_TRANSFORM_COPY); + /* Geometry. */ STRINGIFY_OPCODE(GEOMETRY_UBEREVAL); - STRINGIFY_OPCODE(GEOMETRY_PATH); + /* Pose. */ STRINGIFY_OPCODE(POSE_INIT); + STRINGIFY_OPCODE(POSE_INIT_IK); STRINGIFY_OPCODE(POSE_DONE); STRINGIFY_OPCODE(POSE_IK_SOLVER); STRINGIFY_OPCODE(POSE_SPLINE_IK_SOLVER); + /* Bone. */ STRINGIFY_OPCODE(BONE_LOCAL); STRINGIFY_OPCODE(BONE_POSE_PARENT); STRINGIFY_OPCODE(BONE_CONSTRAINTS); STRINGIFY_OPCODE(BONE_READY); STRINGIFY_OPCODE(BONE_DONE); - STRINGIFY_OPCODE(PSYS_EVAL); - + /* Particles. */ + STRINGIFY_OPCODE(PARTICLE_SYSTEM_EVAL_INIT); + STRINGIFY_OPCODE(PARTICLE_SYSTEM_EVAL); + STRINGIFY_OPCODE(PARTICLE_SETTINGS_EVAL); + STRINGIFY_OPCODE(PARTICLE_SETTINGS_RECALC_CLEAR); + /* Masks. */ + STRINGIFY_OPCODE(MASK_ANIMATION); + STRINGIFY_OPCODE(MASK_EVAL); + /* Collections. */ STRINGIFY_OPCODE(SCENE_LAYER_INIT); STRINGIFY_OPCODE(SCENE_LAYER_EVAL); STRINGIFY_OPCODE(SCENE_LAYER_DONE); - + /* Copy on write. */ STRINGIFY_OPCODE(COPY_ON_WRITE); + /* Shading. */ + STRINGIFY_OPCODE(SHADING); + STRINGIFY_OPCODE(MATERIAL_UPDATE); + STRINGIFY_OPCODE(WORLD_UPDATE); case DEG_NUM_OPCODES: return "SpecialCase"; #undef STRINGIFY_OPCODE |