Commit: ec2bca26e8a32c9425dcdba6dae83b4a9ed6a389
Author: Sergey Sharybin
Date: Tue Jul 18 11:45:43 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBec2bca26e8a32c9425dcdba6dae83b4a9ed6a389
Despgraph: cleanup, make separation of opcodes strings more clear
===================================================================
M source/blender/depsgraph/intern/depsgraph_type_defines.cc
M source/blender/depsgraph/intern/depsgraph_types.h
===================================================================
diff --git a/source/blender/depsgraph/intern/depsgraph_type_defines.cc
b/source/blender/depsgraph/intern/depsgraph_type_defines.cc
index ccac2aeb7ac..d8ffb1bbdc4 100644
--- a/source/blender/depsgraph/intern/depsgraph_type_defines.cc
+++ b/source/blender/depsgraph/intern/depsgraph_type_defines.cc
@@ -98,38 +98,45 @@ 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(PLACEHOLDER);
+ /* Animation, Drivers, etc. */
STRINGIFY_OPCODE(ANIMATION);
STRINGIFY_OPCODE(DRIVER);
+ /* Transform. */
STRINGIFY_OPCODE(TRANSFORM_LOCAL);
STRINGIFY_OPCODE(TRANSFORM_PARENT);
STRINGIFY_OPCODE(TRANSFORM_CONSTRAINTS);
+ /* Rigid body. */
STRINGIFY_OPCODE(RIGIDBODY_REBUILD);
STRINGIFY_OPCODE(RIGIDBODY_SIM);
STRINGIFY_OPCODE(TRANSFORM_RIGIDBODY);
STRINGIFY_OPCODE(TRANSFORM_FINAL);
STRINGIFY_OPCODE(OBJECT_UBEREVAL);
+ /* Geometry. */
STRINGIFY_OPCODE(GEOMETRY_UBEREVAL);
STRINGIFY_OPCODE(GEOMETRY_PATH);
+ /* Pose. */
STRINGIFY_OPCODE(POSE_INIT);
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);
-
+ /* Particles. */
STRINGIFY_OPCODE(PARTICLE_SYSTEM_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);
case DEG_NUM_OPCODES: return "SpecialCase";
diff --git a/source/blender/depsgraph/intern/depsgraph_types.h
b/source/blender/depsgraph/intern/depsgraph_types.h
index c6edbc4b665..9f4ab5cba0f 100644
--- a/source/blender/depsgraph/intern/depsgraph_types.h
+++ b/source/blender/depsgraph/intern/depsgraph_types.h
@@ -136,7 +136,7 @@ typedef enum eDepsNode_Type {
/* Identifiers for common operations (as an enum). */
typedef enum eDepsOperation_Code {
- /* Generic Operations ------------------------------ */
+ /* Generic Operations. ------------------------------ */
/* Placeholder for operations which don't need special mention */
DEG_OPCODE_OPERATION = 0,
@@ -150,7 +150,7 @@ typedef enum eDepsOperation_Code {
/* Driver */
DEG_OPCODE_DRIVER,
- /* Transform --------------------------------------- */
+ /* Transform. -------------------------------------- */
/* Transform entry point - local transforms only */
DEG_OPCODE_TRANSFORM_LOCAL,
/* Parenting */
@@ -162,20 +162,20 @@ typedef enum eDepsOperation_Code {
/* Handle object-level updates, mainly proxies hacks and recalc flags.
*/
DEG_OPCODE_OBJECT_UBEREVAL,
- /* Rigid body -------------------------------------- */
+ /* Rigid body. -------------------------------------- */
/* Perform Simulation */
DEG_OPCODE_RIGIDBODY_REBUILD,
DEG_OPCODE_RIGIDBODY_SIM,
/* Copy results to object */
DEG_OPCODE_TRANSFORM_RIGIDBODY,
- /* Geometry ---------------------------------------- */
+ /* Geometry. ---------------------------------------- */
/* Evaluate the whole geometry, including modifiers. */
DEG_OPCODE_GEOMETRY_UBEREVAL,
/* Curve Objects - Path Calculation (used for path-following tools, */
DEG_OPCODE_GEOMETRY_PATH,
- /* Pose -------------------------------------------- */
+ /* Pose. -------------------------------------------- */
/* Init IK Trees, etc. */
DEG_OPCODE_POSE_INIT,
/* Free IK Trees + Compute Deform Matrices */
@@ -184,7 +184,7 @@ typedef enum eDepsOperation_Code {
DEG_OPCODE_POSE_IK_SOLVER,
DEG_OPCODE_POSE_SPLINE_IK_SOLVER,
- /* Bone -------------------------------------------- */
+ /* Bone. -------------------------------------------- */
/* Bone local transforms - entry point */
DEG_OPCODE_BONE_LOCAL,
/* Pose-space conversion (includes parent + restpose, */
@@ -205,19 +205,19 @@ typedef enum eDepsOperation_Code {
DEG_OPCODE_BONE_READY,
DEG_OPCODE_BONE_DONE,
- /* Particles --------------------------------------- */
+ /* Particles. --------------------------------------- */
/* Particle System evaluation. */
DEG_OPCODE_PARTICLE_SYSTEM_EVAL,
- /* Collections ------------------------------------- */
+ /* Collections. ------------------------------------- */
DEG_OPCODE_SCENE_LAYER_INIT,
DEG_OPCODE_SCENE_LAYER_EVAL,
DEG_OPCODE_SCENE_LAYER_DONE,
- /* Copy on Write ------------------------- */
+ /* Copy on Write. ------------------------------------ */
DEG_OPCODE_COPY_ON_WRITE,
- /* Shading operations ------------------------- */
+ /* Shading. ------------------------------------------- */
DEG_OPCODE_SHADING,
DEG_NUM_OPCODES,
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
