Merge branch 'master' into blender2.8
[blender.git] / source / blender / modifiers / intern / MOD_warp.c
index b340356467a98bc59c749071e7be4419097151be..c9a9e20df233c14444e9e1b0dc718aaaccfc2420 100644 (file)
@@ -42,8 +42,6 @@
 #include "BKE_texture.h"
 #include "BKE_colortools.h"
 
-#include "depsgraph_private.h"
-
 #include "RE_shader_ext.h"
 
 #include "MOD_util.h"
@@ -139,27 +137,6 @@ static void foreachTexLink(ModifierData *md, Object *ob, TexWalkFunc walk, void
        walk(userData, ob, md, "texture");
 }
 
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           struct Scene *UNUSED(scene),
-                           Object *UNUSED(ob), DagNode *obNode)
-{
-       WarpModifierData *wmd = (WarpModifierData *) md;
-
-       if (wmd->object_from && wmd->object_to) {
-               DagNode *fromNode = dag_get_node(forest, wmd->object_from);
-               DagNode *toNode = dag_get_node(forest, wmd->object_to);
-
-               dag_add_relation(forest, fromNode, obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Warp Modifier1");
-               dag_add_relation(forest, toNode, obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Warp Modifier2");
-       }
-
-       if ((wmd->texmapping == MOD_DISP_MAP_OBJECT) && wmd->map_object) {
-               DagNode *curNode = dag_get_node(forest, wmd->map_object);
-               dag_add_relation(forest, curNode, obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Warp Modifier3");
-       }
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *UNUSED(scene),
@@ -391,7 +368,6 @@ ModifierTypeInfo modifierType_Warp = {
        /* requiredDataMask */  requiredDataMask,
        /* freeData */          freeData,
        /* isDisabled */        isDisabled,
-       /* updateDepgraph */    updateDepgraph,
        /* updateDepsgraph */   updateDepsgraph,
        /* dependsOnTime */     dependsOnTime,
        /* dependsOnNormals */  NULL,