diff options
Diffstat (limited to 'source/blender/depsgraph/intern/depsgraph_types.h')
| -rw-r--r-- | source/blender/depsgraph/intern/depsgraph_types.h | 46 |
1 files changed, 31 insertions, 15 deletions
diff --git a/source/blender/depsgraph/intern/depsgraph_types.h b/source/blender/depsgraph/intern/depsgraph_types.h index 737452549ec..abdedd8adb6 100644 --- a/source/blender/depsgraph/intern/depsgraph_types.h +++ b/source/blender/depsgraph/intern/depsgraph_types.h @@ -130,17 +130,21 @@ typedef enum eDepsNode_Type { DEG_NODE_TYPE_EVAL_PARTICLES, /* Material Shading Component */ DEG_NODE_TYPE_SHADING, + DEG_NODE_TYPE_SHADING_PARAMETERS, /* Cache Component */ DEG_NODE_TYPE_CACHE, } 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, + /* Generic parameters evaluation. */ + DEG_OPCODE_PARAMETERS_EVAL, + // XXX: Placeholder while porting depsgraph code DEG_OPCODE_PLACEHOLDER, @@ -150,7 +154,7 @@ typedef enum eDepsOperation_Code { /* Driver */ DEG_OPCODE_DRIVER, - /* Transform --------------------------------------- */ + /* Transform. -------------------------------------- */ /* Transform entry point - local transforms only */ DEG_OPCODE_TRANSFORM_LOCAL, /* Parenting */ @@ -160,31 +164,31 @@ typedef enum eDepsOperation_Code { /* Transform exit point */ DEG_OPCODE_TRANSFORM_FINAL, /* Handle object-level updates, mainly proxies hacks and recalc flags. */ - DEG_OPCODE_OBJECT_UBEREVAL, + DEG_OPCODE_TRANSFORM_OBJECT_UBEREVAL, - /* Rigid body -------------------------------------- */ + /* Rigid body. -------------------------------------- */ /* Perform Simulation */ DEG_OPCODE_RIGIDBODY_REBUILD, DEG_OPCODE_RIGIDBODY_SIM, /* Copy results to object */ - DEG_OPCODE_TRANSFORM_RIGIDBODY, + DEG_OPCODE_RIGIDBODY_TRANSFORM_COPY, - /* 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 -------------------------------------------- */ - /* Init IK Trees, etc. */ + /* Pose. -------------------------------------------- */ + /* Init pose, clear flags, etc. */ DEG_OPCODE_POSE_INIT, + /* Initialize IK solver related pose stuff. */ + DEG_OPCODE_POSE_INIT_IK, /* Free IK Trees + Compute Deform Matrices */ DEG_OPCODE_POSE_DONE, /* IK/Spline Solvers */ 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,18 +209,30 @@ typedef enum eDepsOperation_Code { DEG_OPCODE_BONE_READY, DEG_OPCODE_BONE_DONE, - /* Particles --------------------------------------- */ + /* Particles. --------------------------------------- */ /* Particle System evaluation. */ - DEG_OPCODE_PSYS_EVAL, + DEG_OPCODE_PARTICLE_SYSTEM_EVAL_INIT, + DEG_OPCODE_PARTICLE_SYSTEM_EVAL, + DEG_OPCODE_PARTICLE_SETTINGS_EVAL, + DEG_OPCODE_PARTICLE_SETTINGS_RECALC_CLEAR, - /* 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. ------------------------------------------- */ + DEG_OPCODE_SHADING, + DEG_OPCODE_MATERIAL_UPDATE, + DEG_OPCODE_WORLD_UPDATE, + + /* Masks ------------------------------------------- */ + DEG_OPCODE_MASK_ANIMATION, + DEG_OPCODE_MASK_EVAL, + DEG_NUM_OPCODES, } eDepsOperation_Code; |