Merge branch 'master' into blender2.8
[blender.git] / source / blender / depsgraph / intern / depsgraph_types.h
index abdedd8adb6006b0f0def0c352d9fe52af0b6078..6f5eeff43dff4282afaa77a53df6826729d38ecb 100644 (file)
@@ -176,6 +176,8 @@ typedef enum eDepsOperation_Code {
        /* Geometry. ---------------------------------------- */
        /* Evaluate the whole geometry, including modifiers. */
        DEG_OPCODE_GEOMETRY_UBEREVAL,
+       DEG_OPCODE_GEOMETRY_CLOTH_MODIFIER,
+       DEG_OPCODE_GEOMETRY_SHAPEKEY,
 
        /* Pose. -------------------------------------------- */
        /* Init pose, clear flags, etc. */
@@ -229,10 +231,13 @@ typedef enum eDepsOperation_Code {
        DEG_OPCODE_MATERIAL_UPDATE,
        DEG_OPCODE_WORLD_UPDATE,
 
-       /* Masks ------------------------------------------- */
+       /* Masks------------------------------------------ */
        DEG_OPCODE_MASK_ANIMATION,
        DEG_OPCODE_MASK_EVAL,
 
+       /* Movie clips. ------------------------------------ */
+       DEG_OPCODE_MOVIECLIP_EVAL,
+
        DEG_NUM_OPCODES,
 } eDepsOperation_Code;