Depsgraph: Remove legacy updateDepgraph callbacks from modifiers
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 24 Jan 2017 11:49:23 +0000 (12:49 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 24 Jan 2017 11:49:23 +0000 (12:49 +0100)
55 files changed:
source/blender/blenkernel/BKE_modifier.h
source/blender/modifiers/CMakeLists.txt
source/blender/modifiers/intern/MOD_armature.c
source/blender/modifiers/intern/MOD_array.c
source/blender/modifiers/intern/MOD_bevel.c
source/blender/modifiers/intern/MOD_boolean.c
source/blender/modifiers/intern/MOD_build.c
source/blender/modifiers/intern/MOD_cast.c
source/blender/modifiers/intern/MOD_cloth.c
source/blender/modifiers/intern/MOD_collision.c
source/blender/modifiers/intern/MOD_correctivesmooth.c
source/blender/modifiers/intern/MOD_curve.c
source/blender/modifiers/intern/MOD_datatransfer.c
source/blender/modifiers/intern/MOD_decimate.c
source/blender/modifiers/intern/MOD_displace.c
source/blender/modifiers/intern/MOD_dynamicpaint.c
source/blender/modifiers/intern/MOD_edgesplit.c
source/blender/modifiers/intern/MOD_explode.c
source/blender/modifiers/intern/MOD_fluidsim.c
source/blender/modifiers/intern/MOD_hook.c
source/blender/modifiers/intern/MOD_laplaciandeform.c
source/blender/modifiers/intern/MOD_laplaciansmooth.c
source/blender/modifiers/intern/MOD_lattice.c
source/blender/modifiers/intern/MOD_mask.c
source/blender/modifiers/intern/MOD_meshcache.c
source/blender/modifiers/intern/MOD_meshdeform.c
source/blender/modifiers/intern/MOD_meshsequencecache.c
source/blender/modifiers/intern/MOD_mirror.c
source/blender/modifiers/intern/MOD_multires.c
source/blender/modifiers/intern/MOD_none.c
source/blender/modifiers/intern/MOD_normal_edit.c
source/blender/modifiers/intern/MOD_ocean.c
source/blender/modifiers/intern/MOD_particleinstance.c
source/blender/modifiers/intern/MOD_particlesystem.c
source/blender/modifiers/intern/MOD_remesh.c
source/blender/modifiers/intern/MOD_screw.c
source/blender/modifiers/intern/MOD_shapekey.c
source/blender/modifiers/intern/MOD_shrinkwrap.c
source/blender/modifiers/intern/MOD_simpledeform.c
source/blender/modifiers/intern/MOD_skin.c
source/blender/modifiers/intern/MOD_smoke.c
source/blender/modifiers/intern/MOD_smooth.c
source/blender/modifiers/intern/MOD_softbody.c
source/blender/modifiers/intern/MOD_solidify.c
source/blender/modifiers/intern/MOD_subsurf.c
source/blender/modifiers/intern/MOD_surface.c
source/blender/modifiers/intern/MOD_triangulate.c
source/blender/modifiers/intern/MOD_uvproject.c
source/blender/modifiers/intern/MOD_uvwarp.c
source/blender/modifiers/intern/MOD_warp.c
source/blender/modifiers/intern/MOD_wave.c
source/blender/modifiers/intern/MOD_weightvgedit.c
source/blender/modifiers/intern/MOD_weightvgmix.c
source/blender/modifiers/intern/MOD_weightvgproximity.c
source/blender/modifiers/intern/MOD_wireframe.c

index f6c08909d2312e103b5f13fdd75ffa4c18959dcb..06321700dc0650843edd7489e4805f8b757b7dfd 100644 (file)
@@ -260,15 +260,6 @@ typedef struct ModifierTypeInfo {
         */
        bool (*isDisabled)(struct ModifierData *md, int userRenderParams);
 
-       /* Add the appropriate relations to the DEP graph depending on the
-        * modifier data. 
-        *
-        * This function is optional.
-        */
-       void (*updateDepgraph)(struct ModifierData *md, struct DagForest *forest,
-                              struct Main *bmain, struct Scene *scene,
-                              struct Object *ob, struct DagNode *obNode);
-
        /* Add the appropriate relations to the dependency graph.
         *
         * This function is optional.
index bacfc177432a60e515142995f766ba6f0e14134c..b8ebb375a484d56d3f044243548a57854298401e 100644 (file)
@@ -113,10 +113,6 @@ set(SRC
        intern/MOD_weightvg_util.h
 )
 
-if(WITH_LEGACY_DEPSGRAPH)
-       add_definitions(-DWITH_LEGACY_DEPSGRAPH)
-endif()
-
 if(WITH_ALEMBIC)
        add_definitions(-DWITH_ALEMBIC)
        list(APPEND INC
index 567505ea45ddfcdc1350bd34f6875b4c4dec8d67..8efa4d63675387a8f1fc2ec4f4d3f962a0306cba 100644 (file)
@@ -99,22 +99,6 @@ static void foreachObjectLink(
        walk(userData, ob, &amd->object, IDWALK_NOP);
 }
 
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           struct Scene *UNUSED(scene),
-                           Object *UNUSED(ob),
-                           DagNode *obNode)
-{
-       ArmatureModifierData *amd = (ArmatureModifierData *) md;
-
-       if (amd->object) {
-               DagNode *curNode = dag_get_node(forest, amd->object);
-
-               dag_add_relation(forest, curNode, obNode,
-                                DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Armature Modifier");
-       }
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *UNUSED(scene),
@@ -221,7 +205,6 @@ ModifierTypeInfo modifierType_Armature = {
        /* requiredDataMask */  requiredDataMask,
        /* freeData */          NULL,
        /* isDisabled */        isDisabled,
-       /* updateDepgraph */    updateDepgraph,
        /* updateDepsgraph */   updateDepsgraph,
        /* dependsOnTime */     NULL,
        /* dependsOnNormals */  NULL,
index b049457e6401beb345e043ede385f5421b40e218..6017f964c26882f046a7fa1d205ebff577e18db2 100644 (file)
@@ -101,40 +101,6 @@ static void foreachObjectLink(
        walk(userData, ob, &amd->offset_ob, IDWALK_NOP);
 }
 
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           struct Scene *UNUSED(scene),
-                           Object *UNUSED(ob), DagNode *obNode)
-{
-       ArrayModifierData *amd = (ArrayModifierData *) md;
-
-       if (amd->start_cap) {
-               DagNode *curNode = dag_get_node(forest, amd->start_cap);
-
-               dag_add_relation(forest, curNode, obNode,
-                                DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Array Modifier");
-       }
-       if (amd->end_cap) {
-               DagNode *curNode = dag_get_node(forest, amd->end_cap);
-
-               dag_add_relation(forest, curNode, obNode,
-                                DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Array Modifier");
-       }
-       if (amd->curve_ob) {
-               DagNode *curNode = dag_get_node(forest, amd->curve_ob);
-               curNode->eval_flags |= DAG_EVAL_NEED_CURVE_PATH;
-
-               dag_add_relation(forest, curNode, obNode,
-                                DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Array Modifier");
-       }
-       if (amd->offset_ob) {
-               DagNode *curNode = dag_get_node(forest, amd->offset_ob);
-
-               dag_add_relation(forest, curNode, obNode,
-                                DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Array Modifier");
-       }
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *scene,
@@ -797,7 +763,6 @@ ModifierTypeInfo modifierType_Array = {
        /* requiredDataMask */  NULL,
        /* freeData */          NULL,
        /* isDisabled */        NULL,
-       /* updateDepgraph */    updateDepgraph,
        /* updateDepsgraph */   updateDepsgraph,
        /* dependsOnTime */     NULL,
        /* dependsOnNormals */  NULL,
index 5874029ae0862279b9eec1964bf0ab7b8842b7b2..17b0cd4d7f5caa8ff5f4ee2c2f981adcd5b4e10b 100644 (file)
@@ -213,7 +213,6 @@ ModifierTypeInfo modifierType_Bevel = {
        /* requiredDataMask */  requiredDataMask,
        /* freeData */          NULL,
        /* isDisabled */        NULL,
-       /* updateDepgraph */    NULL,
        /* updateDepsgraph */   NULL,
        /* dependsOnTime */     NULL,
        /* dependsOnNormals */  dependsOnNormals,
index da0f5aa3923742f74182ea1934c38c7ba71ada25..d2f19b78b50e2ed7804dcec190bee1949ea71428 100644 (file)
@@ -104,22 +104,6 @@ static void foreachObjectLink(
        walk(userData, ob, &bmd->object, IDWALK_NOP);
 }
 
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           struct Scene *UNUSED(scene),
-                           Object *UNUSED(ob),
-                           DagNode *obNode)
-{
-       BooleanModifierData *bmd = (BooleanModifierData *) md;
-
-       if (bmd->object) {
-               DagNode *curNode = dag_get_node(forest, bmd->object);
-
-               dag_add_relation(forest, curNode, obNode,
-                                DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Boolean Modifier");
-       }
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *UNUSED(scene),
@@ -459,7 +443,6 @@ ModifierTypeInfo modifierType_Boolean = {
        /* requiredDataMask */  requiredDataMask,
        /* freeData */          NULL,
        /* isDisabled */        isDisabled,
-       /* updateDepgraph */    updateDepgraph,
        /* updateDepsgraph */   updateDepsgraph,
        /* dependsOnTime */     NULL,
        /* dependsOnNormals */  NULL,
index a364eef2974d266d52b5f3023832710368a93c17..d2467a8fc4a7a0ca02e962fae9fed05232a38300 100644 (file)
@@ -322,7 +322,6 @@ ModifierTypeInfo modifierType_Build = {
        /* requiredDataMask */  NULL,
        /* freeData */          NULL,
        /* isDisabled */        NULL,
-       /* updateDepgraph */    NULL,
        /* updateDepsgraph */   NULL,
        /* dependsOnTime */     dependsOnTime,
        /* dependsOnNormals */  NULL,
index 2fe27730370a73fc7c53e24d27c9e80f20c2bab1..16c5de45c49a78de2cd51e89dd4bbc30ba795c78 100644 (file)
@@ -105,22 +105,6 @@ static void foreachObjectLink(
        walk(userData, ob, &cmd->object, IDWALK_NOP);
 }
 
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           struct Scene *UNUSED(scene),
-                           Object *UNUSED(ob),
-                           DagNode *obNode)
-{
-       CastModifierData *cmd = (CastModifierData *) md;
-
-       if (cmd->object) {
-               DagNode *curNode = dag_get_node(forest, cmd->object);
-
-               dag_add_relation(forest, curNode, obNode, DAG_RL_OB_DATA,
-                                "Cast Modifier");
-       }
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *UNUSED(scene),
@@ -513,7 +497,6 @@ ModifierTypeInfo modifierType_Cast = {
        /* requiredDataMask */  requiredDataMask,
        /* freeData */          NULL,
        /* isDisabled */        isDisabled,
-       /* updateDepgraph */    updateDepgraph,
        /* updateDepsgraph */   updateDepsgraph,
        /* dependsOnTime */     NULL,
        /* dependsOnNormals */  NULL,
index ac75b4dbee910a65fd70e92331a89b849cf4041f..b6a7b5b57ecc6eaa770441b4f77e6320de0bc411 100644 (file)
@@ -117,26 +117,6 @@ static void deformVerts(ModifierData *md, Object *ob, DerivedMesh *derivedData,
        dm->release(dm);
 }
 
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           Scene *scene, Object *ob, DagNode *obNode)
-{
-       ClothModifierData *clmd = (ClothModifierData *) md;
-       
-       if (clmd) {
-               /* Actual code uses get_collisionobjects */
-#ifdef WITH_LEGACY_DEPSGRAPH
-               dag_add_collision_relations(forest, scene, ob, obNode, clmd->coll_parms->group, ob->lay|scene->lay, eModifierType_Collision, NULL, true, "Cloth Collision");
-               dag_add_forcefield_relations(forest, scene, ob, obNode, clmd->sim_parms->effector_weights, true, 0, "Cloth Field");
-#else
-       (void)forest;
-       (void)scene;
-       (void)ob;
-       (void)obNode;
-#endif
-       }
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *scene,
@@ -262,7 +242,6 @@ ModifierTypeInfo modifierType_Cloth = {
        /* requiredDataMask */  requiredDataMask,
        /* freeData */          freeData,
        /* isDisabled */        NULL,
-       /* updateDepgraph */    updateDepgraph,
        /* updateDepsgraph */   updateDepsgraph,
        /* dependsOnTime */     dependsOnTime,
        /* dependsOnNormals */  NULL,
index e7ff0a90fbcc0a14a04b7fb6c029d3de20d35986..a2a4b2e127414a3d7799613cdf54c96f68105e93 100644 (file)
@@ -265,7 +265,6 @@ ModifierTypeInfo modifierType_Collision = {
        /* requiredDataMask */  NULL,
        /* freeData */          freeData,
        /* isDisabled */        NULL,
-       /* updateDepgraph */    NULL,
        /* updateDepsgraph */   NULL,
        /* dependsOnTime */     dependsOnTime,
        /* dependsOnNormals */  NULL,
index 77fd84a294890d9cd114f904c3b3e957851ab383..0718b0f85fa6a2f720bd5525be4b7d48960da50f 100644 (file)
@@ -759,7 +759,6 @@ ModifierTypeInfo modifierType_CorrectiveSmooth = {
        /* requiredDataMask */  requiredDataMask,
        /* freeData */          freeData,
        /* isDisabled */        NULL,
-       /* updateDepgraph */    NULL,
        /* updateDepsgraph */   NULL,
        /* dependsOnTime */     NULL,
        /* dependsOnNormals */  NULL,
index 9bc96e593fd000cdff487468490146bb18420c8d..3e9b46ad8ea2417b1718eb0b5b0bc3e46c144b84 100644 (file)
@@ -92,23 +92,6 @@ static void foreachObjectLink(
        walk(userData, ob, &cmd->object, IDWALK_NOP);
 }
 
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           Scene *UNUSED(scene),
-                           Object *UNUSED(ob),
-                           DagNode *obNode)
-{
-       CurveModifierData *cmd = (CurveModifierData *) md;
-
-       if (cmd->object) {
-               DagNode *curNode = dag_get_node(forest, cmd->object);
-               curNode->eval_flags |= DAG_EVAL_NEED_CURVE_PATH;
-
-               dag_add_relation(forest, curNode, obNode,
-                                DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Curve Modifier");
-       }
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *scene,
@@ -178,7 +161,6 @@ ModifierTypeInfo modifierType_Curve = {
        /* requiredDataMask */  requiredDataMask,
        /* freeData */          NULL,
        /* isDisabled */        isDisabled,
-       /* updateDepgraph */    updateDepgraph,
        /* updateDepsgraph */   updateDepsgraph,
        /* dependsOnTime */     NULL,
        /* dependsOnNormals */  NULL,
index f5ab28d3d8835238430fd137714d8b951ac3268a..26952e1e0d594127483693894f73af559e7bd581 100644 (file)
@@ -127,22 +127,6 @@ static void foreachObjectLink(
        walk(userData, ob, &dtmd->ob_source, IDWALK_NOP);
 }
 
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           struct Scene *UNUSED(scene),
-                           Object *UNUSED(ob), DagNode *obNode)
-{
-       DataTransferModifierData *dtmd = (DataTransferModifierData *) md;
-       DagNode *curNode;
-
-       if (dtmd->ob_source) {
-               curNode = dag_get_node(forest, dtmd->ob_source);
-
-               dag_add_relation(forest, curNode, obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA,
-                                "DataTransfer Modifier");
-       }
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *UNUSED(scene),
@@ -251,7 +235,6 @@ ModifierTypeInfo modifierType_DataTransfer = {
        /* requiredDataMask */  requiredDataMask,
        /* freeData */          NULL,
        /* isDisabled */        isDisabled,
-       /* updateDepgraph */    updateDepgraph,
        /* updateDepsgraph */   updateDepsgraph,
        /* dependsOnTime */     NULL,
        /* dependsOnNormals */  dependsOnNormals,
index 617ae5a89f310959dfa9dd15735aedebd4f608a8..bcb52e4e0ca19d2ed226be84a0a10007ba3e4aaf 100644 (file)
@@ -227,7 +227,6 @@ ModifierTypeInfo modifierType_Decimate = {
        /* requiredDataMask */  requiredDataMask,
        /* freeData */          NULL,
        /* isDisabled */        NULL,
-       /* updateDepgraph */    NULL,
        /* updateDepsgraph */   NULL,
        /* dependsOnTime */     NULL,
        /* dependsOnNormals */  NULL,
index 059e096ddb4b3479ebf1eb86d9f554605b0cb4fe..4b5181e9c61442b22148af9fb14d6170cc11f414 100644 (file)
@@ -157,31 +157,6 @@ static bool isDisabled(ModifierData *md, int UNUSED(useRenderParams))
        return ((!dmd->texture && dmd->direction == MOD_DISP_DIR_RGB_XYZ) || dmd->strength == 0.0f);
 }
 
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           struct Scene *UNUSED(scene),
-                           Object *UNUSED(ob),
-                           DagNode *obNode)
-{
-       DisplaceModifierData *dmd = (DisplaceModifierData *) md;
-
-       if (dmd->map_object && dmd->texmapping == MOD_DISP_MAP_OBJECT) {
-               DagNode *curNode = dag_get_node(forest, dmd->map_object);
-
-               dag_add_relation(forest, curNode, obNode,
-                                DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Displace Modifier");
-       }
-       
-
-       if (dmd->texmapping == MOD_DISP_MAP_GLOBAL ||
-           (ELEM(dmd->direction, MOD_DISP_DIR_X, MOD_DISP_DIR_Y, MOD_DISP_DIR_Z, MOD_DISP_DIR_RGB_XYZ) &&
-           dmd->space == MOD_DISP_SPACE_GLOBAL))
-       {
-               dag_add_relation(forest, obNode, obNode,
-                                DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Displace Modifier");
-       }
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *UNUSED(scene),
@@ -393,7 +368,6 @@ ModifierTypeInfo modifierType_Displace = {
        /* requiredDataMask */  requiredDataMask,
        /* freeData */          freeData,
        /* isDisabled */        isDisabled,
-       /* updateDepgraph */    updateDepgraph,
        /* updateDepsgraph */   updateDepsgraph,
        /* dependsOnTime */     dependsOnTime,
        /* dependsOnNormals */  dependsOnNormals,
index b49a407da780346530d491fb233eebcdec3f1476..ee6df153905fee09836e347878ef28643da3039a 100644 (file)
@@ -119,34 +119,6 @@ static bool is_brush_cb(Object *UNUSED(ob), ModifierData *pmd)
        return ((DynamicPaintModifierData*)pmd)->brush != NULL;
 }
 
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           struct Scene *scene,
-                           Object *ob,
-                           DagNode *obNode)
-{
-       DynamicPaintModifierData *pmd = (DynamicPaintModifierData *) md;
-
-       /* add relation from canvases to all brush objects */
-       if (pmd && pmd->canvas) {
-#ifdef WITH_LEGACY_DEPSGRAPH
-               for (DynamicPaintSurface *surface = pmd->canvas->surfaces.first; surface; surface = surface->next) {
-                       if (surface->effect & MOD_DPAINT_EFFECT_DO_DRIP) {
-                               dag_add_forcefield_relations(forest, scene, ob, obNode, surface->effector_weights, true, 0, "Dynamic Paint Field");
-                       }
-
-                       /* Actual code uses custom loop over group/scene without layer checks in dynamicPaint_doStep */
-                       dag_add_collision_relations(forest, scene, ob, obNode, surface->brush_group, -1, eModifierType_DynamicPaint, is_brush_cb, false, "Dynamic Paint Brush");
-               }
-#else
-       (void)forest;
-       (void)scene;
-       (void)ob;
-       (void)obNode;
-#endif
-       }
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *scene,
@@ -221,7 +193,6 @@ ModifierTypeInfo modifierType_DynamicPaint = {
        /* requiredDataMask */  requiredDataMask,
        /* freeData */          freeData,
        /* isDisabled */        NULL,
-       /* updateDepgraph */    updateDepgraph,
        /* updateDepsgraph */   updateDepsgraph,
        /* dependsOnTime */     dependsOnTime,
        /* dependsOnNormals */  NULL,
index 4441edb299bec4944ec96f8955021e2eafef6276..f239807a7d364819b7a04355065a0de10aa18596 100644 (file)
@@ -157,7 +157,6 @@ ModifierTypeInfo modifierType_EdgeSplit = {
        /* requiredDataMask */  NULL,
        /* freeData */          NULL,
        /* isDisabled */        NULL,
-       /* updateDepgraph */    NULL,
        /* updateDepsgraph */   NULL,
        /* dependsOnTime */     NULL,
        /* dependsOnNormals */  NULL,
index 38ffdaa709bb0ca47f8d4b6958e404929fdce204..dea1f9d8d4cadfcc531202e2fddd748e00b84601 100644 (file)
@@ -1059,7 +1059,6 @@ ModifierTypeInfo modifierType_Explode = {
        /* requiredDataMask */  requiredDataMask,
        /* freeData */          freeData,
        /* isDisabled */        NULL,
-       /* updateDepgraph */    NULL,
        /* updateDepsgraph */   NULL,
        /* dependsOnTime */     dependsOnTime,
        /* dependsOnNormals */  NULL,
index c202c5e1cb4efcc404fe4b09d3a406c17aa39ef7..bed25fa82db11491517b9b10e41c7442ed50217a 100644 (file)
@@ -100,33 +100,6 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
        return result ? result : dm;
 }
 
-static void updateDepgraph(
-        ModifierData *md, DagForest *forest,
-        struct Main *UNUSED(bmain), Scene *scene,
-        Object *ob, DagNode *obNode)
-{
-       FluidsimModifierData *fluidmd = (FluidsimModifierData *) md;
-       Base *base;
-
-       if (fluidmd && fluidmd->fss) {
-               if (fluidmd->fss->type == OB_FLUIDSIM_DOMAIN) {
-                       for (base = scene->base.first; base; base = base->next) {
-                               Object *ob1 = base->object;
-                               if (ob1 != ob) {
-                                       FluidsimModifierData *fluidmdtmp =
-                                               (FluidsimModifierData *)modifiers_findByType(ob1, eModifierType_Fluidsim);
-                                       
-                                       /* only put dependencies from NON-DOMAIN fluids in here */
-                                       if (fluidmdtmp && fluidmdtmp->fss && (fluidmdtmp->fss->type != OB_FLUIDSIM_DOMAIN)) {
-                                               DagNode *curNode = dag_get_node(forest, ob1);
-                                               dag_add_relation(forest, curNode, obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Fluidsim Object");
-                                       }
-                               }
-                       }
-               }
-       }
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *scene,
@@ -180,7 +153,6 @@ ModifierTypeInfo modifierType_Fluidsim = {
        /* requiredDataMask */  NULL,
        /* freeData */          freeData,
        /* isDisabled */        NULL,
-       /* updateDepgraph */    updateDepgraph,
        /* updateDepsgraph */   updateDepsgraph,
        /* dependsOnTime */     dependsOnTime,
        /* dependsOnNormals */  NULL,
index 9186b10d8ca4a833a28cdf45d1bc87dd5dc90d51..13d94abc92dd0deee6ee405abf50df5d11e9eea1 100644 (file)
@@ -118,24 +118,6 @@ static void foreachObjectLink(
        walk(userData, ob, &hmd->object, IDWALK_NOP);
 }
 
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           struct Scene *UNUSED(scene),
-                           Object *UNUSED(ob),
-                           DagNode *obNode)
-{
-       HookModifierData *hmd = (HookModifierData *) md;
-
-       if (hmd->object) {
-               DagNode *curNode = dag_get_node(forest, hmd->object);
-               
-               if (hmd->subtarget[0])
-                       dag_add_relation(forest, curNode, obNode, DAG_RL_OB_DATA | DAG_RL_DATA_DATA, "Hook Modifier");
-               else
-                       dag_add_relation(forest, curNode, obNode, DAG_RL_OB_DATA, "Hook Modifier");
-       }
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *UNUSED(scene),
@@ -427,7 +409,6 @@ ModifierTypeInfo modifierType_Hook = {
        /* requiredDataMask */  requiredDataMask,
        /* freeData */          freeData,
        /* isDisabled */        isDisabled,
-       /* updateDepgraph */    updateDepgraph,
        /* updateDepsgraph */   updateDepsgraph,
        /* dependsOnTime */     NULL,
        /* dependsOnNormals */  NULL,
index ce3fdc4bbe826fecc384f2cc83b4d56a48a3b505..56a2e217a2a0696184382b6ce8f160a6728a67ea 100644 (file)
@@ -775,7 +775,6 @@ ModifierTypeInfo modifierType_LaplacianDeform = {
        /* requiredDataMask */  requiredDataMask,
        /* freeData */          freeData,
        /* isDisabled */        isDisabled,
-       /* updateDepgraph */    NULL,
        /* updateDepsgraph */   NULL,
        /* dependsOnTime */     NULL,
        /* dependsOnNormals */  NULL,
index f1216ff462ae1d84ebe7d5a9a7b4b7bf5c278a4f..1295a75d9e72eb0917e47b14e6d6924d1c3bb13b 100644 (file)
@@ -561,7 +561,6 @@ ModifierTypeInfo modifierType_LaplacianSmooth = {
        /* requiredDataMask */  required_data_mask,
        /* freeData */          NULL,
        /* isDisabled */        is_disabled,
-       /* updateDepgraph */    NULL,
        /* updateDepsgraph */   NULL,
        /* dependsOnTime */     NULL,
        /* dependsOnNormals */  NULL,
index 7d4701e3ef27918b299e402e89a55ea6a92ee282..292c2db61f83e20665f27c1fd43d2083aa2aa01c 100644 (file)
@@ -91,22 +91,6 @@ static void foreachObjectLink(
        walk(userData, ob, &lmd->object, IDWALK_NOP);
 }
 
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           struct Scene *UNUSED(scene),
-                           Object *UNUSED(ob),
-                           DagNode *obNode)
-{
-       LatticeModifierData *lmd = (LatticeModifierData *) md;
-
-       if (lmd->object) {
-               DagNode *latNode = dag_get_node(forest, lmd->object);
-
-               dag_add_relation(forest, latNode, obNode,
-                                DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Lattice Modifier");
-       }
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *UNUSED(scene),
@@ -169,7 +153,6 @@ ModifierTypeInfo modifierType_Lattice = {
        /* requiredDataMask */  requiredDataMask,
        /* freeData */          NULL,
        /* isDisabled */        isDisabled,
-       /* updateDepgraph */    updateDepgraph,
        /* updateDepsgraph */   updateDepsgraph,
        /* dependsOnTime */     NULL,
        /* dependsOnNormals */  NULL,
index 5e01a20d93b70334477769ed6e5109b3ee3a5d01..7cb2f2c25d5657288f96fdce5e530ebe383fd34e 100644 (file)
@@ -77,24 +77,6 @@ static void foreachObjectLink(
        walk(userData, ob, &mmd->ob_arm, IDWALK_NOP);
 }
 
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           struct Scene *UNUSED(scene),
-                           Object *UNUSED(ob),
-                           DagNode *obNode)
-{
-       MaskModifierData *mmd = (MaskModifierData *)md;
-
-       if (mmd->ob_arm) {
-               bArmature *arm = (bArmature *)mmd->ob_arm->data;
-               DagNode *armNode = dag_get_node(forest, mmd->ob_arm);
-               
-               /* tag relationship in depsgraph, but also on the armature */
-               dag_add_relation(forest, armNode, obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Mask Modifier");
-               arm->flag |= ARM_HAS_VIZ_DEPS;
-       }
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *UNUSED(scene),
@@ -401,7 +383,6 @@ ModifierTypeInfo modifierType_Mask = {
        /* requiredDataMask */  requiredDataMask,
        /* freeData */          NULL,
        /* isDisabled */        NULL,
-       /* updateDepgraph */    updateDepgraph,
        /* updateDepsgraph */   updateDepsgraph,
        /* dependsOnTime */     NULL,
        /* dependsOnNormals */  NULL,
index aa3e3ebcf7eeb37f0bae928502e8964ec9b65a81..0d96032c5159cdb90a79ac49dbb4e7bfcd0d2ff8 100644 (file)
@@ -313,7 +313,6 @@ ModifierTypeInfo modifierType_MeshCache = {
        /* requiredDataMask */  NULL,
        /* freeData */          NULL,
        /* isDisabled */        isDisabled,
-       /* updateDepgraph */    NULL,
        /* updateDepsgraph */   NULL,
        /* dependsOnTime */     dependsOnTime,
        /* dependsOnNormals */  NULL,
index 3f34319d25f81938c5f1cff40dc0a5d3b7f3dec3..27782b05cd2d66436233ae5a72ed52ea3315e6b8 100644 (file)
@@ -122,23 +122,6 @@ static void foreachObjectLink(
        walk(userData, ob, &mmd->object, IDWALK_NOP);
 }
 
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           struct Scene *UNUSED(scene),
-                           Object *UNUSED(ob),
-                           DagNode *obNode)
-{
-       MeshDeformModifierData *mmd = (MeshDeformModifierData *) md;
-
-       if (mmd->object) {
-               DagNode *curNode = dag_get_node(forest, mmd->object);
-
-               dag_add_relation(forest, curNode, obNode,
-                                DAG_RL_DATA_DATA | DAG_RL_OB_DATA | DAG_RL_DATA_OB | DAG_RL_OB_OB,
-                                "Mesh Deform Modifier");
-       }
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *UNUSED(scene),
@@ -534,7 +517,6 @@ ModifierTypeInfo modifierType_MeshDeform = {
        /* requiredDataMask */  requiredDataMask,
        /* freeData */          freeData,
        /* isDisabled */        isDisabled,
-       /* updateDepgraph */    updateDepgraph,
        /* updateDepsgraph */   updateDepsgraph,
        /* dependsOnTime */     NULL,
        /* dependsOnNormals */  NULL,
index 2f00a7c71b09129dbbcb2f7de0c3ffd3373e38c8..985c365bb693e3431265580e1960818abceb0e6d 100644 (file)
@@ -155,23 +155,6 @@ static void foreachIDLink(ModifierData *md, Object *ob,
 }
 
 
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *bmain,
-                           struct Scene *scene,
-                           Object *ob, DagNode *obNode)
-{
-       MeshSeqCacheModifierData *mcmd = (MeshSeqCacheModifierData *) md;
-
-       if (mcmd->cache_file != NULL) {
-               DagNode *curNode = dag_get_node(forest, mcmd->cache_file);
-
-               dag_add_relation(forest, curNode, obNode,
-                                DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Cache File Modifier");
-       }
-
-       UNUSED_VARS(bmain, scene, ob);
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *bmain,
                             struct Scene *scene,
@@ -205,7 +188,6 @@ ModifierTypeInfo modifierType_MeshSequenceCache = {
     /* requiredDataMask */  NULL,
     /* freeData */          freeData,
     /* isDisabled */        isDisabled,
-    /* updateDepgraph */    updateDepgraph,
     /* updateDepsgraph */   updateDepsgraph,
     /* dependsOnTime */     dependsOnTime,
     /* dependsOnNormals */  NULL,
index 88facb22e0eecfcffeecd00838e72ace12ad394e..9fdd75aeb684e0fa6fb00eb9c91262e90d8a6240 100644 (file)
@@ -75,21 +75,6 @@ static void foreachObjectLink(
        walk(userData, ob, &mmd->mirror_ob, IDWALK_NOP);
 }
 
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           struct Scene *UNUSED(scene),
-                           Object *UNUSED(ob),
-                           DagNode *obNode)
-{
-       MirrorModifierData *mmd = (MirrorModifierData *) md;
-
-       if (mmd->mirror_ob) {
-               DagNode *latNode = dag_get_node(forest, mmd->mirror_ob);
-
-               dag_add_relation(forest, latNode, obNode, DAG_RL_OB_DATA, "Mirror Modifier");
-       }
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *UNUSED(scene),
@@ -375,7 +360,6 @@ ModifierTypeInfo modifierType_Mirror = {
        /* requiredDataMask */  NULL,
        /* freeData */          NULL,
        /* isDisabled */        NULL,
-       /* updateDepgraph */    updateDepgraph,
        /* updateDepsgraph */   updateDepsgraph,
        /* dependsOnTime */     NULL,
        /* dependsOnNormals */  NULL,
index 90ad1bdfdc28ca88983ae918f09c2103c12b8292..aba184b7d40a3c49f815b67287cd8e92ad669207 100644 (file)
@@ -161,7 +161,6 @@ ModifierTypeInfo modifierType_Multires = {
        /* requiredDataMask */  NULL,
        /* freeData */          NULL,
        /* isDisabled */        NULL,
-       /* updateDepgraph */    NULL,
        /* updateDepsgraph */   NULL,
        /* dependsOnTime */     NULL,
        /* dependsOnNormals */  NULL,
index d9d9ba2966d364df95f87f1e95a41bbbe6286ed1..3fb780f566d7bb8e22898aa34ab0a9892f1ab116 100644 (file)
@@ -67,7 +67,6 @@ ModifierTypeInfo modifierType_None = {
        /* requiredDataMask */  NULL,
        /* freeData */          NULL,
        /* isDisabled */        isDisabled,
-       /* updateDepgraph */    NULL,
        /* updateDepsgraph */   NULL,
        /* dependsOnTime */     NULL,
        /* dependsOnNormals */  NULL,
index 454c97451a8afe82c3a5ffeb8037acb1945a9f10..eefca658305bfd2f5d71a2f0cbcb6186ffa29dc4 100644 (file)
@@ -511,20 +511,6 @@ static bool isDisabled(ModifierData *md, int UNUSED(useRenderParams))
        return !is_valid_target(enmd);
 }
 
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           struct Scene *UNUSED(scene),
-                           Object *UNUSED(ob), DagNode *obNode)
-{
-       NormalEditModifierData *enmd = (NormalEditModifierData *) md;
-
-       if (enmd->target) {
-               DagNode *Node = dag_get_node(forest, enmd->target);
-
-               dag_add_relation(forest, Node, obNode, DAG_RL_OB_DATA, "NormalEdit Modifier");
-       }
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *UNUSED(scene),
@@ -562,7 +548,6 @@ ModifierTypeInfo modifierType_NormalEdit = {
        /* requiredDataMask */  requiredDataMask,
        /* freeData */          NULL,
        /* isDisabled */        isDisabled,
-       /* updateDepgraph */    updateDepgraph,
        /* updateDepsgraph */   updateDepsgraph,
        /* dependsOnTime */     NULL,
        /* dependsOnNormals */  dependsOnNormals,
index e77cc655c16996a8833d2d41e0606141b6c9de19..1be603c7ab5bec3c0fdef1ff9c502c83c37908e3 100644 (file)
@@ -597,7 +597,6 @@ ModifierTypeInfo modifierType_Ocean = {
        /* requiredDataMask */  requiredDataMask,
        /* freeData */          freeData,
        /* isDisabled */        NULL,
-       /* updateDepgraph */    NULL,
        /* updateDepsgraph */   NULL,
        /* dependsOnTime */     NULL,
        /* dependsOnNormals */  dependsOnNormals,
index 4e78e758dc3568b8f7af629c5ccd61716b85057d..a468cc6600d7dc405856b42bd9144fbd228e732b 100644 (file)
@@ -110,24 +110,6 @@ static bool isDisabled(ModifierData *md, int useRenderParams)
        return false;
 }
 
-
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           struct Scene *UNUSED(scene),
-                           Object *UNUSED(ob),
-                           DagNode *obNode)
-{
-       ParticleInstanceModifierData *pimd = (ParticleInstanceModifierData *) md;
-
-       if (pimd->ob) {
-               DagNode *curNode = dag_get_node(forest, pimd->ob);
-
-               dag_add_relation(forest, curNode, obNode,
-                                DAG_RL_DATA_DATA | DAG_RL_OB_DATA,
-                                "Particle Instance Modifier");
-       }
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *UNUSED(scene),
@@ -460,7 +442,6 @@ ModifierTypeInfo modifierType_ParticleInstance = {
        /* requiredDataMask */  NULL,
        /* freeData */          NULL,
        /* isDisabled */        isDisabled,
-       /* updateDepgraph */    updateDepgraph,
        /* updateDepsgraph */   updateDepsgraph,
        /* dependsOnTime */     NULL,
        /* dependsOnNormals */  NULL,
index d8cccca415ca67a8ea899b5fde2acf7de4c5000b..a3b9d808b172f1d8ec2de55588fb957ca2974142 100644 (file)
@@ -231,7 +231,6 @@ ModifierTypeInfo modifierType_ParticleSystem = {
        /* requiredDataMask */  requiredDataMask,
        /* freeData */          freeData,
        /* isDisabled */        NULL,
-       /* updateDepgraph */    NULL,
        /* updateDepsgraph */   NULL,
        /* dependsOnTime */     NULL,
        /* dependsOnNormals */  NULL,
index b85898c07e98cb05215ac2d811fa5ba690265f1a..fb5c12399a448cf9bb525e89bb1e491289d8e8f8 100644 (file)
@@ -231,7 +231,6 @@ ModifierTypeInfo modifierType_Remesh = {
        /* requiredDataMask */  NULL,
        /* freeData */          NULL,
        /* isDisabled */        NULL,
-       /* updateDepgraph */    NULL,
        /* updateDepsgraph */   NULL,
        /* dependsOnTime */     NULL,
        /* dependsOnNormals */  NULL,
index 290e19736bb8d4c34d19f330320d22e958c9bd1c..a834d1b5cae349a2acc38eeb0f8c8580e2e598fb 100644 (file)
@@ -1057,24 +1057,6 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
        return result;
 }
 
-
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           struct Scene *UNUSED(scene),
-                           Object *UNUSED(ob),
-                           DagNode *obNode)
-{
-       ScrewModifierData *ltmd = (ScrewModifierData *) md;
-
-       if (ltmd->ob_axis) {
-               DagNode *curNode = dag_get_node(forest, ltmd->ob_axis);
-
-               dag_add_relation(forest, curNode, obNode,
-                                DAG_RL_DATA_DATA | DAG_RL_OB_DATA,
-                                "Screw Modifier");
-       }
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *UNUSED(scene),
@@ -1118,7 +1100,6 @@ ModifierTypeInfo modifierType_Screw = {
        /* requiredDataMask */  NULL,
        /* freeData */          NULL,
        /* isDisabled */        NULL,
-       /* updateDepgraph */    updateDepgraph,
        /* updateDepsgraph */   updateDepsgraph,
        /* dependsOnTime */     NULL,
        /* dependsOnNormals */  NULL,
index 97aae733532fedc41886cc791bea3781508b3dd6..6c8bd06c1967c274b2b767b6a799a2ddb0b56047 100644 (file)
@@ -138,7 +138,6 @@ ModifierTypeInfo modifierType_ShapeKey = {
        /* requiredDataMask */  NULL,
        /* freeData */          NULL,
        /* isDisabled */        NULL,
-       /* updateDepgraph */    NULL,
        /* updateDepsgraph */   NULL,
        /* dependsOnTime */     NULL,
        /* dependsOnNormals */  NULL,
index 633311c2b870f10683f26da71d712d185ea5ce61..29bce2ef3a4c68821e2cdd281ef7e86e1060d981 100644 (file)
@@ -143,23 +143,6 @@ static void deformVertsEM(ModifierData *md, Object *ob, struct BMEditMesh *editD
                dm->release(dm);
 }
 
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           struct Scene *UNUSED(scene),
-                           Object *UNUSED(ob),
-                           DagNode *obNode)
-{
-       ShrinkwrapModifierData *smd = (ShrinkwrapModifierData *) md;
-
-       if (smd->target)
-               dag_add_relation(forest, dag_get_node(forest, smd->target), obNode,
-                                DAG_RL_OB_DATA | DAG_RL_DATA_DATA, "Shrinkwrap Modifier");
-
-       if (smd->auxTarget)
-               dag_add_relation(forest, dag_get_node(forest, smd->auxTarget), obNode,
-                                DAG_RL_OB_DATA | DAG_RL_DATA_DATA, "Shrinkwrap Modifier");
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *UNUSED(scene),
@@ -209,7 +192,6 @@ ModifierTypeInfo modifierType_Shrinkwrap = {
        /* requiredDataMask */  requiredDataMask,
        /* freeData */          NULL,
        /* isDisabled */        isDisabled,
-       /* updateDepgraph */    updateDepgraph,
        /* updateDepsgraph */   updateDepsgraph,
        /* dependsOnTime */     NULL,
        /* dependsOnNormals */  dependsOnNormals,
index c68f26511917af16bc0d737102c4b1949a81f150..118d01173612d749e351d06f1d83d5b8ab4a0541 100644 (file)
@@ -293,18 +293,6 @@ static void foreachObjectLink(
        walk(userData, ob, &smd->origin, IDWALK_NOP);
 }
 
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           struct Scene *UNUSED(scene),
-                           Object *UNUSED(ob),
-                           DagNode *obNode)
-{
-       SimpleDeformModifierData *smd  = (SimpleDeformModifierData *)md;
-
-       if (smd->origin)
-               dag_add_relation(forest, dag_get_node(forest, smd->origin), obNode, DAG_RL_OB_DATA, "SimpleDeform Modifier");
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *UNUSED(scene),
@@ -381,7 +369,6 @@ ModifierTypeInfo modifierType_SimpleDeform = {
        /* requiredDataMask */  requiredDataMask,
        /* freeData */          NULL,
        /* isDisabled */        NULL,
-       /* updateDepgraph */    updateDepgraph,
        /* updateDepsgraph */   updateDepsgraph,
        /* dependsOnTime */     NULL,
        /* dependsOnNormals */  NULL,
index 8ed623734bef648f0b96cee7e4ec42d5c07575d2..4b84aeb335a5a3301488703ada0c002bec623c8a 100644 (file)
@@ -1950,7 +1950,6 @@ ModifierTypeInfo modifierType_Skin = {
        /* requiredDataMask */  requiredDataMask,
        /* freeData */          NULL,
        /* isDisabled */        NULL,
-       /* updateDepgraph */    NULL,
        /* updateDepsgraph */   NULL,
        /* dependsOnTime */     NULL,
        /* dependsOnNormals */  NULL,
index a7b23ae24036701888c767c26158fd614919633b..637ed3ee390cb793f6c5ac4c5fb616383c0c96ed 100644 (file)
@@ -129,28 +129,6 @@ static bool is_coll_cb(Object *UNUSED(ob), ModifierData *md)
        return (smd->type & MOD_SMOKE_TYPE_COLL) && smd->coll;
 }
 
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           struct Scene *scene, struct Object *ob,
-                           DagNode *obNode)
-{
-       SmokeModifierData *smd = (SmokeModifierData *) md;
-
-       if (smd && (smd->type & MOD_SMOKE_TYPE_DOMAIN) && smd->domain) {
-               /* Actual code uses get_collisionobjects */
-#ifdef WITH_LEGACY_DEPSGRAPH
-               dag_add_collision_relations(forest, scene, ob, obNode, smd->domain->fluid_group, ob->lay|scene->lay, eModifierType_Smoke, is_flow_cb, true, "Smoke Flow");
-               dag_add_collision_relations(forest, scene, ob, obNode, smd->domain->coll_group, ob->lay|scene->lay, eModifierType_Smoke, is_coll_cb, true, "Smoke Coll");
-               dag_add_forcefield_relations(forest, scene, ob, obNode, smd->domain->effector_weights, true, PFIELD_SMOKEFLOW, "Smoke Force Field");
-#else
-       (void)forest;
-       (void)scene;
-       (void)ob;
-       (void)obNode;
-#endif
-       }
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *scene,
@@ -208,7 +186,6 @@ ModifierTypeInfo modifierType_Smoke = {
        /* requiredDataMask */  requiredDataMask,
        /* freeData */          freeData,
        /* isDisabled */        NULL,
-       /* updateDepgraph */    updateDepgraph,
        /* updateDepsgraph */   updateDepsgraph,
        /* dependsOnTime */     dependsOnTime,
        /* dependsOnNormals */  NULL,
index d45c85285106ae0f747eba16a1a4a2c54fa3b79b..f0f20acb8ea97fad14638363ca8003af02d0b904 100644 (file)
@@ -261,7 +261,6 @@ ModifierTypeInfo modifierType_Smooth = {
        /* requiredDataMask */  requiredDataMask,
        /* freeData */          NULL,
        /* isDisabled */        isDisabled,
-       /* updateDepgraph */    NULL,
        /* updateDepsgraph */   NULL,
        /* dependsOnTime */     NULL,
        /* dependsOnNormals */  NULL,
index a0bbe5da04ae8f672e6d31e7fe1f203345b9a83e..412f0a3ce535342ff0fff4de591197c20abbe0c8 100644 (file)
@@ -62,25 +62,6 @@ static bool dependsOnTime(ModifierData *UNUSED(md))
        return true;
 }
 
-static void updateDepgraph(ModifierData *UNUSED(md), DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           Scene *scene, Object *ob, DagNode *obNode)
-{
-       if (ob->soft) {
-#ifdef WITH_LEGACY_DEPSGRAPH
-               /* Actual code uses ccd_build_deflector_hash */
-               dag_add_collision_relations(forest, scene, ob, obNode, ob->soft->collision_group, ob->lay, eModifierType_Collision, NULL, false, "Softbody Collision");
-
-               dag_add_forcefield_relations(forest, scene, ob, obNode, ob->soft->effector_weights, true, 0, "Softbody Field");
-#else
-       (void)forest;
-       (void)scene;
-       (void)ob;
-       (void)obNode;
-#endif
-       }
-}
-
 static void updateDepsgraph(ModifierData *UNUSED(md),
                             struct Main *UNUSED(bmain),
                             struct Scene *scene,
@@ -116,7 +97,6 @@ ModifierTypeInfo modifierType_Softbody = {
        /* requiredDataMask */  NULL,
        /* freeData */          NULL,
        /* isDisabled */        NULL,
-       /* updateDepgraph */    updateDepgraph,
        /* updateDepsgraph */   updateDepsgraph,
        /* dependsOnTime */     dependsOnTime,
        /* dependsOnNormals */  NULL,
index 911b6997058e62edf4534a76487bd545eac633a6..e589cb7d7132aa993b262844488ac94ae368aa9e 100644 (file)
@@ -973,7 +973,6 @@ ModifierTypeInfo modifierType_Solidify = {
        /* requiredDataMask */  requiredDataMask,
        /* freeData */          NULL,
        /* isDisabled */        NULL,
-       /* updateDepgraph */    NULL,
        /* updateDepsgraph */   NULL,
        /* dependsOnTime */     NULL,
        /* dependsOnNormals */  dependsOnNormals,
index 8711384e1eee17a4d31964329f48a8920502968e..af3ffb820c16658269ab7ccbc1e310088a29b208 100644 (file)
@@ -211,7 +211,6 @@ ModifierTypeInfo modifierType_Subsurf = {
        /* requiredDataMask */  NULL,
        /* freeData */          freeData,
        /* isDisabled */        isDisabled,
-       /* updateDepgraph */    NULL,
        /* updateDepsgraph */   NULL,
        /* dependsOnTime */     NULL,
        /* dependsOnNormals */  dependsOnNormals,
index 68987a1d28e47491feadfa2bf452d7d4c95e8056..fc02a2e13276732b639a22388e05da4ff9b838da 100644 (file)
@@ -185,7 +185,6 @@ ModifierTypeInfo modifierType_Surface = {
        /* requiredDataMask */  NULL,
        /* freeData */          freeData,
        /* isDisabled */        NULL,
-       /* updateDepgraph */    NULL,
        /* updateDepsgraph */   NULL,
        /* dependsOnTime */     dependsOnTime,
        /* dependsOnNormals */  NULL,
index 6fad2756f82eb31f56b05b1b9f75d986e56a2378..a5d826a69bae888b2c90c5bffbdce7e5539b727a 100644 (file)
@@ -118,7 +118,6 @@ ModifierTypeInfo modifierType_Triangulate = {
        /* requiredDataMask */  NULL, //requiredDataMask,
        /* freeData */          NULL,
        /* isDisabled */        NULL,
-       /* updateDepgraph */    NULL,
        /* updateDepsgraph */   NULL,
        /* dependsOnTime */     NULL,
        /* dependsOnNormals */  NULL,
index fb7668d16e0dec21706f3059e7734650cde0d258..54c25b687e12cd8674f517388a7718cc24173719 100644 (file)
@@ -105,25 +105,6 @@ static void foreachIDLink(ModifierData *md, Object *ob,
        foreachObjectLink(md, ob, (ObjectWalkFunc)walk, userData);
 }
 
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           struct Scene *UNUSED(scene),
-                           Object *UNUSED(ob),
-                           DagNode *obNode)
-{
-       UVProjectModifierData *umd = (UVProjectModifierData *) md;
-       int i;
-
-       for (i = 0; i < umd->num_projectors; ++i) {
-               if (umd->projectors[i]) {
-                       DagNode *curNode = dag_get_node(forest, umd->projectors[i]);
-
-                       dag_add_relation(forest, curNode, obNode,
-                                        DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "UV Project Modifier");
-               }
-       }
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *UNUSED(scene),
@@ -385,7 +366,6 @@ ModifierTypeInfo modifierType_UVProject = {
        /* requiredDataMask */  requiredDataMask,
        /* freeData */          NULL,
        /* isDisabled */        NULL,
-       /* updateDepgraph */    updateDepgraph,
        /* updateDepsgraph */   updateDepsgraph,
        /* dependsOnTime */     NULL,
        /* dependsOnNormals */  NULL,
index 89994c3ae22392ebd1da40db83a8d3342d823d6b..2ac6892b7b83102d06c20b835b39a575bb2c1df8 100644 (file)
@@ -238,18 +238,6 @@ static void uv_warp_deps_object_bone(DagForest *forest, DagNode *obNode,
        }
 }
 
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           struct Scene *UNUSED(scene),
-                           Object *UNUSED(ob),
-                           DagNode *obNode)
-{
-       UVWarpModifierData *umd = (UVWarpModifierData *) md;
-
-       uv_warp_deps_object_bone(forest, obNode, umd->object_src, umd->bone_src);
-       uv_warp_deps_object_bone(forest, obNode, umd->object_dst, umd->bone_dst);
-}
-
 static void uv_warp_deps_object_bone_new(struct DepsNodeHandle *node,
                                          Object *object,
                                          const char *bonename)
@@ -293,7 +281,6 @@ ModifierTypeInfo modifierType_UVWarp = {
        /* requiredDataMask */  requiredDataMask,
        /* freeData */          NULL,
        /* isDisabled */        NULL,
-       /* updateDepgraph */    updateDepgraph,
        /* updateDepsgraph */   updateDepsgraph,
        /* dependsOnTime */     NULL,
        /* dependsOnNormals */  NULL,
index b38de140a91c63ca7aa77cb92f9d8430a9a29113..13ce72ee2f5ffb5696253c80ea95eee0bdaaa44f 100644 (file)
@@ -135,27 +135,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),
@@ -387,7 +366,6 @@ ModifierTypeInfo modifierType_Warp = {
        /* requiredDataMask */  requiredDataMask,
        /* freeData */          freeData,
        /* isDisabled */        isDisabled,
-       /* updateDepgraph */    updateDepgraph,
        /* updateDepsgraph */   updateDepsgraph,
        /* dependsOnTime */     dependsOnTime,
        /* dependsOnNormals */  NULL,
index 683649ed1c01db3da8a0336ef3cdcd47af380843..291913675c35028ebc429bff9ebf328e9038154d 100644 (file)
@@ -131,29 +131,6 @@ static void foreachTexLink(ModifierData *md, Object *ob,
        walk(userData, ob, md, "texture");
 }
 
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           Scene *UNUSED(scene),
-                           Object *UNUSED(ob),
-                           DagNode *obNode)
-{
-       WaveModifierData *wmd = (WaveModifierData *) md;
-
-       if (wmd->objectcenter) {
-               DagNode *curNode = dag_get_node(forest, wmd->objectcenter);
-
-               dag_add_relation(forest, curNode, obNode, DAG_RL_OB_DATA,
-                                "Wave Modifier");
-       }
-
-       if (wmd->map_object) {
-               DagNode *curNode = dag_get_node(forest, wmd->map_object);
-
-               dag_add_relation(forest, curNode, obNode, DAG_RL_OB_DATA,
-                                "Wave Modifer");
-       }
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *UNUSED(scene),
@@ -397,7 +374,6 @@ ModifierTypeInfo modifierType_Wave = {
        /* requiredDataMask */  requiredDataMask,
        /* freeData */          freeData,
        /* isDisabled */        NULL,
-       /* updateDepgraph */    updateDepgraph,
        /* updateDepsgraph */   updateDepsgraph,
        /* dependsOnTime */     dependsOnTime,
        /* dependsOnNormals */  NULL,
index 93567aed2c4147eb6c6fa17ae77aa5d5f9f41cba..585b223d436bf5268f06c7920113eb33b14c5e46 100644 (file)
@@ -143,26 +143,6 @@ static void foreachTexLink(ModifierData *md, Object *ob, TexWalkFunc walk, void
        walk(userData, ob, md, "mask_texture");
 }
 
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           struct Scene *UNUSED(scene),
-                           Object *UNUSED(ob), DagNode *obNode)
-{
-       WeightVGEditModifierData *wmd = (WeightVGEditModifierData *) md;
-       DagNode *curNode;
-
-       if (wmd->mask_tex_map_obj && wmd->mask_tex_mapping == MOD_DISP_MAP_OBJECT) {
-               curNode = dag_get_node(forest, wmd->mask_tex_map_obj);
-
-               dag_add_relation(forest, curNode, obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA,
-                                "WeightVGEdit Modifier");
-       }
-
-       if (wmd->mask_tex_mapping == MOD_DISP_MAP_GLOBAL)
-               dag_add_relation(forest, obNode, obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA,
-                                "WeightVGEdit Modifier");
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *UNUSED(scene),
@@ -307,7 +287,6 @@ ModifierTypeInfo modifierType_WeightVGEdit = {
        /* requiredDataMask */  requiredDataMask,
        /* freeData */          freeData,
        /* isDisabled */        isDisabled,
-       /* updateDepgraph */    updateDepgraph,
        /* updateDepsgraph */   updateDepsgraph,
        /* dependsOnTime */     dependsOnTime,
        /* dependsOnNormals */  NULL,
index 170fbbed7f1a20c02efd7c3d6cc0f17d34b42b11..a6adf72e4ebdceca9680e5850d3dadfe9fd34de2 100644 (file)
@@ -192,26 +192,6 @@ static void foreachTexLink(ModifierData *md, Object *ob, TexWalkFunc walk, void
        walk(userData, ob, md, "mask_texture");
 }
 
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           struct Scene *UNUSED(scene),
-                           Object *UNUSED(ob), DagNode *obNode)
-{
-       WeightVGMixModifierData *wmd = (WeightVGMixModifierData *) md;
-       DagNode *curNode;
-
-       if (wmd->mask_tex_map_obj && wmd->mask_tex_mapping == MOD_DISP_MAP_OBJECT) {
-               curNode = dag_get_node(forest, wmd->mask_tex_map_obj);
-
-               dag_add_relation(forest, curNode, obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA,
-                                "WeightVGMix Modifier");
-       }
-
-       if (wmd->mask_tex_mapping == MOD_DISP_MAP_GLOBAL)
-               dag_add_relation(forest, obNode, obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA,
-                                "WeightVGMix Modifier");
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *UNUSED(scene),
@@ -439,7 +419,6 @@ ModifierTypeInfo modifierType_WeightVGMix = {
        /* requiredDataMask */  requiredDataMask,
        /* freeData */          freeData,
        /* isDisabled */        isDisabled,
-       /* updateDepgraph */    updateDepgraph,
        /* updateDepsgraph */   updateDepsgraph,
        /* dependsOnTime */     dependsOnTime,
        /* dependsOnNormals */  NULL,
index af59f11ba153631fc236ef21f72a1481faf18c34..b26cbc3a7d3b0a535a9dc4cd6ceeb1156124f9ff 100644 (file)
@@ -343,32 +343,6 @@ static void foreachTexLink(ModifierData *md, Object *ob, TexWalkFunc walk, void
        walk(userData, ob, md, "mask_texture");
 }
 
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           struct Scene *UNUSED(scene),
-                           Object *UNUSED(ob), DagNode *obNode)
-{
-       WeightVGProximityModifierData *wmd = (WeightVGProximityModifierData *) md;
-       DagNode *curNode;
-
-       if (wmd->proximity_ob_target) {
-               curNode = dag_get_node(forest, wmd->proximity_ob_target);
-               dag_add_relation(forest, curNode, obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA,
-                                "WeightVGProximity Modifier");
-       }
-
-       if (wmd->mask_tex_map_obj && wmd->mask_tex_mapping == MOD_DISP_MAP_OBJECT) {
-               curNode = dag_get_node(forest, wmd->mask_tex_map_obj);
-
-               dag_add_relation(forest, curNode, obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA,
-                                "WeightVGProximity Modifier");
-       }
-
-       if (wmd->mask_tex_mapping == MOD_DISP_MAP_GLOBAL)
-               dag_add_relation(forest, obNode, obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA,
-                                "WeightVGProximity Modifier");
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *UNUSED(scene),
@@ -617,7 +591,6 @@ ModifierTypeInfo modifierType_WeightVGProximity = {
        /* requiredDataMask */  requiredDataMask,
        /* freeData */          freeData,
        /* isDisabled */        isDisabled,
-       /* updateDepgraph */    updateDepgraph,
        /* updateDepsgraph */   updateDepsgraph,
        /* dependsOnTime */     dependsOnTime,
        /* dependsOnNormals */  NULL,
index adadd4834d46f8ed122dd2cf9d17753859813f5b..0c295f910124e26c3fc164466ae56f61eb65e8e8 100644 (file)
@@ -132,7 +132,6 @@ ModifierTypeInfo modifierType_Wireframe = {
        /* requiredDataMask */  requiredDataMask,
        /* freeData */          NULL,
        /* isDisabled */        isDisabled,
-       /* updateDepgraph */    NULL,
        /* updateDepsgraph */   NULL,
        /* dependsOnTime */     NULL,
        /* dependsOnNormals */  dependsOnNormals,