Merge branch 'master' into blender2.8
[blender.git] / source / blender / depsgraph / intern / depsgraph_type_defines.cc
index e5033affe2f6c11b345c462e2db34d0d7f7f226f..405c8e8733960a7dcfe5a97aae44ce7b69975542 100644 (file)
@@ -66,7 +66,9 @@ static GHash *_depsnode_typeinfo_registry = NULL;
 void deg_register_node_typeinfo(DepsNodeFactory *factory)
 {
        BLI_assert(factory != NULL);
-       BLI_ghash_insert(_depsnode_typeinfo_registry, SET_INT_IN_POINTER(factory->type()), factory);
+       BLI_ghash_insert(_depsnode_typeinfo_registry,
+                        SET_INT_IN_POINTER(factory->type()),
+                        factory);
 }
 
 /* Getters ------------------------------------------------- */
@@ -75,7 +77,8 @@ void deg_register_node_typeinfo(DepsNodeFactory *factory)
 DepsNodeFactory *deg_get_node_factory(const eDepsNode_Type type)
 {
        /* look up type - at worst, it doesn't exist in table yet, and we fail */
-       return (DepsNodeFactory *)BLI_ghash_lookup(_depsnode_typeinfo_registry, SET_INT_IN_POINTER(type));
+       return (DepsNodeFactory *)BLI_ghash_lookup(_depsnode_typeinfo_registry,
+                                                  SET_INT_IN_POINTER(type));
 }
 
 /* Get typeinfo for provided node */
@@ -95,31 +98,52 @@ 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_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);
-               STRINGIFY_OPCODE(PSYS_EVAL_INIT);
+               /* Particles. */
+               STRINGIFY_OPCODE(PARTICLE_SYSTEM_EVAL_INIT);
+               STRINGIFY_OPCODE(PARTICLE_SYSTEM_EVAL);
+               STRINGIFY_OPCODE(PARTICLE_SETTINGS_EVAL);
+               STRINGIFY_OPCODE(PARTICLE_SETTINGS_RECALC_CLEAR);
+               /* 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