archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Depsgraph: Wrap all arguments foe modifiers relations update into a struct

Browse Source 
Makes it easier to add or remove fields needed to update relations.
This commit is contained in:
Sergey Sharybin
2018-02-22 12:54:06 +01:00
parent 93072e44d1
commit df04520602
34 changed files with 251 additions and 479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
source/blender/blenkernel/BKE_modifier.h
View File

@@ -127,6 +127,19 @@ typedef enum ModifierApplyFlag {
} ModifierApplyFlag; } ModifierApplyFlag;
typedef struct ModifierUpdateDepsgraphContext {
struct Main *bmain;
struct Scene *scene;
struct Object *object;
/* Old depsgraph node handle. */
struct DagForest *forest;
struct DagNode *obNode;
/* new depsgraph node handle. */
struct DepsNodeHandle *node;
} ModifierUpdateDepsgraphContext;
typedef struct ModifierTypeInfo { typedef struct ModifierTypeInfo {
/* The user visible name for this modifier */ /* The user visible name for this modifier */
char name[32]; char name[32];
@@ -265,9 +278,8 @@ typedef struct ModifierTypeInfo {
* *
* This function is optional. * This function is optional.
*/ */
void (*updateDepgraph)(struct ModifierData *md, struct DagForest *forest, void (*updateDepgraph)(struct ModifierData *md,
struct Main *bmain, struct Scene *scene, const ModifierUpdateDepsgraphContext* ctx);
struct Object *ob, struct DagNode *obNode);
/* Add the appropriate relations to the dependency graph. /* Add the appropriate relations to the dependency graph.
* *
@@ -275,10 +287,7 @@ typedef struct ModifierTypeInfo {
*/ */
/* TODO(sergey): Remove once we finally switched to the new depsgraph. */ /* TODO(sergey): Remove once we finally switched to the new depsgraph. */
void (*updateDepsgraph)(struct ModifierData *md, void (*updateDepsgraph)(struct ModifierData *md,
struct Main *bmain, const ModifierUpdateDepsgraphContext* ctx);
struct Scene *scene,
struct Object *ob,
struct DepsNodeHandle *node);
/* Should return true if the modifier needs to be recalculated on time /* Should return true if the modifier needs to be recalculated on time
* changes. * changes.

9
source/blender/blenkernel/intern/depsgraph.c
View File

@@ -645,11 +645,18 @@ static void build_dag_object(DagForest *dag, DagNode *scenenode, Main *bmain, Sc
if (ob->modifiers.first) { if (ob->modifiers.first) {
ModifierData *md; ModifierData *md;
ModifierUpdateDepsgraphContext ctx = {
.bmain = bmain,
.scene = scene,
.object = ob,
.forest = dag,
.obNode = node,
};
for (md = ob->modifiers.first; md; md = md->next) { for (md = ob->modifiers.first; md; md = md->next) {
const ModifierTypeInfo *mti = modifierType_getInfo(md->type); const ModifierTypeInfo *mti = modifierType_getInfo(md->type);
if (mti->updateDepgraph) mti->updateDepgraph(md, dag, bmain, scene, ob, node); if (mti->updateDepgraph) mti->updateDepgraph(md, &ctx);
} }
} }
if (ob->parent) { if (ob->parent) {

12
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
View File

@@ -1539,17 +1539,17 @@ void DepsgraphRelationBuilder::build_obdata_geom(Object *object)
OperationKey obdata_ubereval_key(&object->id, OperationKey obdata_ubereval_key(&object->id,
DEG_NODE_TYPE_GEOMETRY, DEG_NODE_TYPE_GEOMETRY,
DEG_OPCODE_GEOMETRY_UBEREVAL); DEG_OPCODE_GEOMETRY_UBEREVAL);
ModifierUpdateDepsgraphContext ctx = {};
ctx.bmain = bmain_;
ctx.scene = scene_;
ctx.object = object;
LISTBASE_FOREACH (ModifierData *, md, &object->modifiers) { LISTBASE_FOREACH (ModifierData *, md, &object->modifiers) {
const ModifierTypeInfo *mti = modifierType_getInfo((ModifierType)md->type); const ModifierTypeInfo *mti = modifierType_getInfo((ModifierType)md->type);
if (mti->updateDepsgraph) { if (mti->updateDepsgraph) {
DepsNodeHandle handle = create_node_handle(obdata_ubereval_key); DepsNodeHandle handle = create_node_handle(obdata_ubereval_key);
mti->updateDepsgraph( ctx.node = reinterpret_cast< ::DepsNodeHandle* >(&handle);
md, mti->updateDepsgraph(md, &ctx);
bmain_,
scene_,
object,
reinterpret_cast< ::DepsNodeHandle* >(&handle));
} }
if (BKE_object_modifier_use_time(object, md)) { if (BKE_object_modifier_use_time(object, md)) {
TimeSourceKey time_src_key; TimeSourceKey time_src_key;

20
source/blender/modifiers/intern/MOD_armature.c
View File

@@ -99,32 +99,24 @@ static void foreachObjectLink(
walk(userData, ob, &amd->object, IDWALK_CB_NOP); walk(userData, ob, &amd->object, IDWALK_CB_NOP);
} }
static void updateDepgraph(ModifierData *md, DagForest *forest, static void updateDepgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *UNUSED(scene),
Object *UNUSED(ob),
DagNode *obNode)
{ {
ArmatureModifierData *amd = (ArmatureModifierData *) md; ArmatureModifierData *amd = (ArmatureModifierData *) md;
if (amd->object) { if (amd->object) {
DagNode *curNode = dag_get_node(forest, amd->object); DagNode *curNode = dag_get_node(ctx->forest, amd->object);
dag_add_relation(forest, curNode, obNode, dag_add_relation(ctx->forest, curNode, ctx->obNode,
DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Armature Modifier"); DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Armature Modifier");
} }
} }
static void updateDepsgraph(ModifierData *md, static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *UNUSED(scene),
Object *UNUSED(ob),
struct DepsNodeHandle *node)
{ {
ArmatureModifierData *amd = (ArmatureModifierData *)md; ArmatureModifierData *amd = (ArmatureModifierData *)md;
if (amd->object != NULL) { if (amd->object != NULL) {
DEG_add_object_relation(node, amd->object, DEG_OB_COMP_EVAL_POSE, "Armature Modifier"); DEG_add_object_relation(ctx->node, amd->object, DEG_OB_COMP_EVAL_POSE, "Armature Modifier");
DEG_add_object_relation(node, amd->object, DEG_OB_COMP_TRANSFORM, "Armature Modifier"); DEG_add_object_relation(ctx->node, amd->object, DEG_OB_COMP_TRANSFORM, "Armature Modifier");
} }
} }

37
source/blender/modifiers/intern/MOD_array.c
View File

@@ -102,60 +102,53 @@ static void foreachObjectLink(
walk(userData, ob, &amd->offset_ob, IDWALK_CB_NOP); walk(userData, ob, &amd->offset_ob, IDWALK_CB_NOP);
} }
static void updateDepgraph(ModifierData *md, DagForest *forest, static void updateDepgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *UNUSED(scene),
Object *UNUSED(ob), DagNode *obNode)
{ {
ArrayModifierData *amd = (ArrayModifierData *) md; ArrayModifierData *amd = (ArrayModifierData *) md;
if (amd->start_cap) { if (amd->start_cap) {
DagNode *curNode = dag_get_node(forest, amd->start_cap); DagNode *curNode = dag_get_node(ctx->forest, amd->start_cap);
dag_add_relation(forest, curNode, obNode, dag_add_relation(ctx->forest, curNode, ctx->obNode,
DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Array Modifier"); DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Array Modifier");
} }
if (amd->end_cap) { if (amd->end_cap) {
DagNode *curNode = dag_get_node(forest, amd->end_cap); DagNode *curNode = dag_get_node(ctx->forest, amd->end_cap);
dag_add_relation(forest, curNode, obNode, dag_add_relation(ctx->forest, curNode, ctx->obNode,
DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Array Modifier"); DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Array Modifier");
} }
if (amd->curve_ob) { if (amd->curve_ob) {
DagNode *curNode = dag_get_node(forest, amd->curve_ob); DagNode *curNode = dag_get_node(ctx->forest, amd->curve_ob);
curNode->eval_flags |= DAG_EVAL_NEED_CURVE_PATH; curNode->eval_flags |= DAG_EVAL_NEED_CURVE_PATH;
dag_add_relation(forest, curNode, obNode, dag_add_relation(ctx->forest, curNode, ctx->obNode,
DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Array Modifier"); DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Array Modifier");
} }
if (amd->offset_ob) { if (amd->offset_ob) {
DagNode *curNode = dag_get_node(forest, amd->offset_ob); DagNode *curNode = dag_get_node(ctx->forest, amd->offset_ob);
dag_add_relation(forest, curNode, obNode, dag_add_relation(ctx->forest, curNode, ctx->obNode,
DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Array Modifier"); DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Array Modifier");
} }
} }
static void updateDepsgraph(ModifierData *md, static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *UNUSED(scene),
Object *UNUSED(ob),
struct DepsNodeHandle *node)
{ {
ArrayModifierData *amd = (ArrayModifierData *)md; ArrayModifierData *amd = (ArrayModifierData *)md;
if (amd->start_cap != NULL) { if (amd->start_cap != NULL) {
DEG_add_object_relation(node, amd->start_cap, DEG_OB_COMP_TRANSFORM, "Array Modifier Start Cap"); DEG_add_object_relation(ctx->node, amd->start_cap, DEG_OB_COMP_TRANSFORM, "Array Modifier Start Cap");
} }
if (amd->end_cap != NULL) { if (amd->end_cap != NULL) {
DEG_add_object_relation(node, amd->end_cap, DEG_OB_COMP_TRANSFORM, "Array Modifier End Cap"); DEG_add_object_relation(ctx->node, amd->end_cap, DEG_OB_COMP_TRANSFORM, "Array Modifier End Cap");
} }
if (amd->curve_ob) { if (amd->curve_ob) {
struct Depsgraph *depsgraph = DEG_get_graph_from_handle(node); struct Depsgraph *depsgraph = DEG_get_graph_from_handle(ctx->node);
DEG_add_object_relation(node, amd->curve_ob, DEG_OB_COMP_GEOMETRY, "Array Modifier Curve"); DEG_add_object_relation(ctx->node, amd->curve_ob, DEG_OB_COMP_GEOMETRY, "Array Modifier Curve");
DEG_add_special_eval_flag(depsgraph, &amd->curve_ob->id, DAG_EVAL_NEED_CURVE_PATH); DEG_add_special_eval_flag(depsgraph, &amd->curve_ob->id, DAG_EVAL_NEED_CURVE_PATH);
} }
if (amd->offset_ob != NULL) { if (amd->offset_ob != NULL) {
DEG_add_object_relation(node, amd->offset_ob, DEG_OB_COMP_TRANSFORM, "Array Modifier Offset"); DEG_add_object_relation(ctx->node, amd->offset_ob, DEG_OB_COMP_TRANSFORM, "Array Modifier Offset");
} }
} }

22
source/blender/modifiers/intern/MOD_boolean.c
View File

@@ -97,35 +97,27 @@ static void foreachObjectLink(
walk(userData, ob, &bmd->object, IDWALK_CB_NOP); walk(userData, ob, &bmd->object, IDWALK_CB_NOP);
} }
static void updateDepgraph(ModifierData *md, DagForest *forest, static void updateDepgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *UNUSED(scene),
Object *UNUSED(ob),
DagNode *obNode)
{ {
BooleanModifierData *bmd = (BooleanModifierData *) md; BooleanModifierData *bmd = (BooleanModifierData *) md;
if (bmd->object) { if (bmd->object) {
DagNode *curNode = dag_get_node(forest, bmd->object); DagNode *curNode = dag_get_node(ctx->forest, bmd->object);
dag_add_relation(forest, curNode, obNode, dag_add_relation(ctx->forest, curNode, ctx->obNode,
DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Boolean Modifier"); DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Boolean Modifier");
} }
} }
static void updateDepsgraph(ModifierData *md, static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *UNUSED(scene),
Object *ob,
struct DepsNodeHandle *node)
{ {
BooleanModifierData *bmd = (BooleanModifierData *)md; BooleanModifierData *bmd = (BooleanModifierData *)md;
if (bmd->object != NULL) { if (bmd->object != NULL) {
DEG_add_object_relation(node, bmd->object, DEG_OB_COMP_TRANSFORM, "Boolean Modifier"); DEG_add_object_relation(ctx->node, bmd->object, DEG_OB_COMP_TRANSFORM, "Boolean Modifier");
DEG_add_object_relation(node, bmd->object, DEG_OB_COMP_GEOMETRY, "Boolean Modifier"); DEG_add_object_relation(ctx->node, bmd->object, DEG_OB_COMP_GEOMETRY, "Boolean Modifier");
} }
/* We need own transformation as well. */ /* We need own transformation as well. */
DEG_add_object_relation(node, ob, DEG_OB_COMP_TRANSFORM, "Boolean Modifier"); DEG_add_object_relation(ctx->node, ctx->object, DEG_OB_COMP_TRANSFORM, "Boolean Modifier");
} }
static DerivedMesh *get_quick_derivedMesh( static DerivedMesh *get_quick_derivedMesh(

20
source/blender/modifiers/intern/MOD_cast.c
View File

@@ -105,32 +105,24 @@ static void foreachObjectLink(
walk(userData, ob, &cmd->object, IDWALK_CB_NOP); walk(userData, ob, &cmd->object, IDWALK_CB_NOP);
} }
static void updateDepgraph(ModifierData *md, DagForest *forest, static void updateDepgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *UNUSED(scene),
Object *UNUSED(ob),
DagNode *obNode)
{ {
CastModifierData *cmd = (CastModifierData *) md; CastModifierData *cmd = (CastModifierData *) md;
if (cmd->object) { if (cmd->object) {
DagNode *curNode = dag_get_node(forest, cmd->object); DagNode *curNode = dag_get_node(ctx->forest, cmd->object);
dag_add_relation(forest, curNode, obNode, DAG_RL_OB_DATA, dag_add_relation(ctx->forest, curNode, ctx->obNode, DAG_RL_OB_DATA,
"Cast Modifier"); "Cast Modifier");
} }
} }
static void updateDepsgraph(ModifierData *md, static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *UNUSED(scene),
Object *object,
struct DepsNodeHandle *node)
{ {
CastModifierData *cmd = (CastModifierData *)md; CastModifierData *cmd = (CastModifierData *)md;
if (cmd->object != NULL) { if (cmd->object != NULL) {
DEG_add_object_relation(node, cmd->object, DEG_OB_COMP_TRANSFORM, "Cast Modifier"); DEG_add_object_relation(ctx->node, cmd->object, DEG_OB_COMP_TRANSFORM, "Cast Modifier");
DEG_add_object_relation(node, object, DEG_OB_COMP_TRANSFORM, "Cast Modifier"); DEG_add_object_relation(ctx->node, ctx->object, DEG_OB_COMP_TRANSFORM, "Cast Modifier");
} }
} }

18
source/blender/modifiers/intern/MOD_cloth.c
View File

@@ -117,17 +117,15 @@ static void deformVerts(ModifierData *md, Object *ob, DerivedMesh *derivedData,
dm->release(dm); dm->release(dm);
} }
static void updateDepgraph(ModifierData *md, DagForest *forest, static void updateDepgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
Scene *scene, Object *ob, DagNode *obNode)
{ {
ClothModifierData *clmd = (ClothModifierData *) md; ClothModifierData *clmd = (ClothModifierData *) md;
if (clmd) { if (clmd) {
/* Actual code uses get_collisionobjects */ /* Actual code uses get_collisionobjects */
#ifdef WITH_LEGACY_DEPSGRAPH #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_collision_relations(ctx->forest, ctx->scene, ctx->object, ctx->obNode, clmd->coll_parms->group, ctx->object->lay|ctx->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"); dag_add_forcefield_relations(ctx->forest, ctx->scene, ctx->object, ctx->obNode, clmd->sim_parms->effector_weights, true, 0, "Cloth Field");
#else #else
(void)forest; (void)forest;
(void)scene; (void)scene;
@@ -137,18 +135,14 @@ static void updateDepgraph(ModifierData *md, DagForest *forest,
} }
} }
static void updateDepsgraph(ModifierData *md, static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *scene,
Object *ob,
struct DepsNodeHandle *node)
{ {
ClothModifierData *clmd = (ClothModifierData *)md; ClothModifierData *clmd = (ClothModifierData *)md;
if (clmd != NULL) { if (clmd != NULL) {
/* Actual code uses get_collisionobjects */ /* Actual code uses get_collisionobjects */
DEG_add_collision_relations(node, scene, ob, clmd->coll_parms->group, ob->lay|scene->lay, eModifierType_Collision, NULL, true, "Cloth Collision"); DEG_add_collision_relations(ctx->node, ctx->scene, ctx->object, clmd->coll_parms->group, ctx->object->lay|ctx->scene->lay, eModifierType_Collision, NULL, true, "Cloth Collision");
DEG_add_forcefield_relations(node, scene, ob, clmd->sim_parms->effector_weights, true, 0, "Cloth Field"); DEG_add_forcefield_relations(ctx->node, ctx->scene, ctx->object, clmd->sim_parms->effector_weights, true, 0, "Cloth Field");
} }
} }

22
source/blender/modifiers/intern/MOD_curve.c
View File

@@ -92,28 +92,20 @@ static void foreachObjectLink(
walk(userData, ob, &cmd->object, IDWALK_CB_NOP); walk(userData, ob, &cmd->object, IDWALK_CB_NOP);
} }
static void updateDepgraph(ModifierData *md, DagForest *forest, static void updateDepgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
Scene *UNUSED(scene),
Object *UNUSED(ob),
DagNode *obNode)
{ {
CurveModifierData *cmd = (CurveModifierData *) md; CurveModifierData *cmd = (CurveModifierData *) md;
if (cmd->object) { if (cmd->object) {
DagNode *curNode = dag_get_node(forest, cmd->object); DagNode *curNode = dag_get_node(ctx->forest, cmd->object);
curNode->eval_flags |= DAG_EVAL_NEED_CURVE_PATH; curNode->eval_flags |= DAG_EVAL_NEED_CURVE_PATH;
dag_add_relation(forest, curNode, obNode, dag_add_relation(ctx->forest, curNode, ctx->obNode,
DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Curve Modifier"); DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Curve Modifier");
} }
} }
static void updateDepsgraph(ModifierData *md, static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *UNUSED(scene),
Object *object,
struct DepsNodeHandle *node)
{ {
CurveModifierData *cmd = (CurveModifierData *)md; CurveModifierData *cmd = (CurveModifierData *)md;
if (cmd->object != NULL) { if (cmd->object != NULL) {
@@ -123,12 +115,12 @@ static void updateDepsgraph(ModifierData *md,
/* TODO(sergey): Currently path is evaluated as a part of modifier stack, /* TODO(sergey): Currently path is evaluated as a part of modifier stack,
* might be changed in the future. * might be changed in the future.
*/ */
struct Depsgraph *depsgraph = DEG_get_graph_from_handle(node); struct Depsgraph *depsgraph = DEG_get_graph_from_handle(ctx->node);
DEG_add_object_relation(node, cmd->object, DEG_OB_COMP_GEOMETRY, "Curve Modifier"); DEG_add_object_relation(ctx->node, cmd->object, DEG_OB_COMP_GEOMETRY, "Curve Modifier");
DEG_add_special_eval_flag(depsgraph, &cmd->object->id, DAG_EVAL_NEED_CURVE_PATH); DEG_add_special_eval_flag(depsgraph, &cmd->object->id, DAG_EVAL_NEED_CURVE_PATH);
} }
DEG_add_object_relation(node, object, DEG_OB_COMP_TRANSFORM, "Curve Modifier"); DEG_add_object_relation(ctx->node, ctx->object, DEG_OB_COMP_TRANSFORM, "Curve Modifier");
} }
static void deformVerts(ModifierData *md, Object *ob, static void deformVerts(ModifierData *md, Object *ob,

17
source/blender/modifiers/intern/MOD_datatransfer.c
View File

@@ -127,31 +127,24 @@ static void foreachObjectLink(
walk(userData, ob, &dtmd->ob_source, IDWALK_CB_NOP); walk(userData, ob, &dtmd->ob_source, IDWALK_CB_NOP);
} }
static void updateDepgraph(ModifierData *md, DagForest *forest, static void updateDepgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *UNUSED(scene),
Object *UNUSED(ob), DagNode *obNode)
{ {
DataTransferModifierData *dtmd = (DataTransferModifierData *) md; DataTransferModifierData *dtmd = (DataTransferModifierData *) md;
DagNode *curNode; DagNode *curNode;
if (dtmd->ob_source) { if (dtmd->ob_source) {
curNode = dag_get_node(forest, dtmd->ob_source); curNode = dag_get_node(ctx->forest, dtmd->ob_source);
dag_add_relation(forest, curNode, obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA, dag_add_relation(ctx->forest, curNode, ctx->obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA,
"DataTransfer Modifier"); "DataTransfer Modifier");
} }
} }
static void updateDepsgraph(ModifierData *md, static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *UNUSED(scene),
Object *UNUSED(ob),
struct DepsNodeHandle *node)
{ {
DataTransferModifierData *dtmd = (DataTransferModifierData *) md; DataTransferModifierData *dtmd = (DataTransferModifierData *) md;
if (dtmd->ob_source != NULL) { if (dtmd->ob_source != NULL) {
DEG_add_object_relation(node, dtmd->ob_source, DEG_OB_COMP_GEOMETRY, "DataTransfer Modifier"); DEG_add_object_relation(ctx->node, dtmd->ob_source, DEG_OB_COMP_GEOMETRY, "DataTransfer Modifier");
} }
} }

22
source/blender/modifiers/intern/MOD_displace.c
View File

@@ -155,18 +155,14 @@ static bool isDisabled(ModifierData *md, int UNUSED(useRenderParams))
return ((!dmd->texture && dmd->direction == MOD_DISP_DIR_RGB_XYZ) || dmd->strength == 0.0f); return ((!dmd->texture && dmd->direction == MOD_DISP_DIR_RGB_XYZ) || dmd->strength == 0.0f);
} }
static void updateDepgraph(ModifierData *md, DagForest *forest, static void updateDepgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *UNUSED(scene),
Object *UNUSED(ob),
DagNode *obNode)
{ {
DisplaceModifierData *dmd = (DisplaceModifierData *) md; DisplaceModifierData *dmd = (DisplaceModifierData *) md;
if (dmd->map_object && dmd->texmapping == MOD_DISP_MAP_OBJECT) { if (dmd->map_object && dmd->texmapping == MOD_DISP_MAP_OBJECT) {
DagNode *curNode = dag_get_node(forest, dmd->map_object); DagNode *curNode = dag_get_node(ctx->forest, dmd->map_object);
dag_add_relation(forest, curNode, obNode, dag_add_relation(ctx->forest, curNode, ctx->obNode,
DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Displace Modifier"); DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Displace Modifier");
} }
@@ -175,26 +171,22 @@ static void updateDepgraph(ModifierData *md, DagForest *forest,
(ELEM(dmd->direction, MOD_DISP_DIR_X, MOD_DISP_DIR_Y, MOD_DISP_DIR_Z, MOD_DISP_DIR_RGB_XYZ) && (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)) dmd->space == MOD_DISP_SPACE_GLOBAL))
{ {
dag_add_relation(forest, obNode, obNode, dag_add_relation(ctx->forest, ctx->obNode, ctx->obNode,
DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Displace Modifier"); DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Displace Modifier");
} }
} }
static void updateDepsgraph(ModifierData *md, static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *UNUSED(scene),
Object *ob,
struct DepsNodeHandle *node)
{ {
DisplaceModifierData *dmd = (DisplaceModifierData *)md; DisplaceModifierData *dmd = (DisplaceModifierData *)md;
if (dmd->map_object != NULL && dmd->texmapping == MOD_DISP_MAP_OBJECT) { if (dmd->map_object != NULL && dmd->texmapping == MOD_DISP_MAP_OBJECT) {
DEG_add_object_relation(node, dmd->map_object, DEG_OB_COMP_TRANSFORM, "Displace Modifier"); DEG_add_object_relation(ctx->node, dmd->map_object, DEG_OB_COMP_TRANSFORM, "Displace Modifier");
} }
if (dmd->texmapping == MOD_DISP_MAP_GLOBAL || 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) && (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)) dmd->space == MOD_DISP_SPACE_GLOBAL))
{ {
DEG_add_object_relation(node, ob, DEG_OB_COMP_TRANSFORM, "Displace Modifier"); DEG_add_object_relation(ctx->node, ctx->object, DEG_OB_COMP_TRANSFORM, "Displace Modifier");
} }
} }

20
source/blender/modifiers/intern/MOD_dynamicpaint.c
View File

@@ -130,11 +130,7 @@ static bool is_brush_cb(Object *UNUSED(ob), ModifierData *pmd)
return ((DynamicPaintModifierData *)pmd)->brush != NULL; return ((DynamicPaintModifierData *)pmd)->brush != NULL;
} }
static void updateDepgraph(ModifierData *md, DagForest *forest, static void updateDepgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *scene,
Object *ob,
DagNode *obNode)
{ {
DynamicPaintModifierData *pmd = (DynamicPaintModifierData *) md; DynamicPaintModifierData *pmd = (DynamicPaintModifierData *) md;
@@ -143,11 +139,11 @@ static void updateDepgraph(ModifierData *md, DagForest *forest,
#ifdef WITH_LEGACY_DEPSGRAPH #ifdef WITH_LEGACY_DEPSGRAPH
for (DynamicPaintSurface *surface = pmd->canvas->surfaces.first; surface; surface = surface->next) { for (DynamicPaintSurface *surface = pmd->canvas->surfaces.first; surface; surface = surface->next) {
if (surface->effect & MOD_DPAINT_EFFECT_DO_DRIP) { if (surface->effect & MOD_DPAINT_EFFECT_DO_DRIP) {
dag_add_forcefield_relations(forest, scene, ob, obNode, surface->effector_weights, true, 0, "Dynamic Paint Field"); dag_add_forcefield_relations(ctx->forest, ctx->scene, ctx->object, ctx->obNode, surface->effector_weights, true, 0, "Dynamic Paint Field");
} }
/* Actual code uses custom loop over group/scene without layer checks in dynamicPaint_doStep */ /* 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"); dag_add_collision_relations(ctx->forest, ctx->scene, ctx->object, ctx->obNode, surface->brush_group, -1, eModifierType_DynamicPaint, is_brush_cb, false, "Dynamic Paint Brush");
} }
#else #else
(void)forest; (void)forest;
@@ -158,22 +154,18 @@ static void updateDepgraph(ModifierData *md, DagForest *forest,
} }
} }
static void updateDepsgraph(ModifierData *md, static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *scene,
Object *ob,
struct DepsNodeHandle *node)
{ {
DynamicPaintModifierData *pmd = (DynamicPaintModifierData *)md; DynamicPaintModifierData *pmd = (DynamicPaintModifierData *)md;
/* Add relation from canvases to all brush objects. */ /* Add relation from canvases to all brush objects. */
if (pmd->canvas != NULL) { if (pmd->canvas != NULL) {
for (DynamicPaintSurface *surface = pmd->canvas->surfaces.first; surface; surface = surface->next) { for (DynamicPaintSurface *surface = pmd->canvas->surfaces.first; surface; surface = surface->next) {
if (surface->effect & MOD_DPAINT_EFFECT_DO_DRIP) { if (surface->effect & MOD_DPAINT_EFFECT_DO_DRIP) {
DEG_add_forcefield_relations(node, scene, ob, surface->effector_weights, true, 0, "Dynamic Paint Field"); DEG_add_forcefield_relations(ctx->node, ctx->scene, ctx->object, surface->effector_weights, true, 0, "Dynamic Paint Field");
} }
/* Actual code uses custom loop over group/scene without layer checks in dynamicPaint_doStep */ /* Actual code uses custom loop over group/scene without layer checks in dynamicPaint_doStep */
DEG_add_collision_relations(node, scene, ob, surface->brush_group, -1, eModifierType_DynamicPaint, is_brush_cb, false, "Dynamic Paint Brush"); DEG_add_collision_relations(ctx->node, ctx->scene, ctx->object, surface->brush_group, -1, eModifierType_DynamicPaint, is_brush_cb, false, "Dynamic Paint Brush");
} }
} }
} }

25
source/blender/modifiers/intern/MOD_fluidsim.c
View File

@@ -103,26 +103,23 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
return result ? result : dm; return result ? result : dm;
} }
static void updateDepgraph( static void updateDepgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
ModifierData *md, DagForest *forest,
struct Main *UNUSED(bmain), Scene *scene,
Object *ob, DagNode *obNode)
{ {
FluidsimModifierData *fluidmd = (FluidsimModifierData *) md; FluidsimModifierData *fluidmd = (FluidsimModifierData *) md;
Base *base; Base *base;
if (fluidmd && fluidmd->fss) { if (fluidmd && fluidmd->fss) {
if (fluidmd->fss->type == OB_FLUIDSIM_DOMAIN) { if (fluidmd->fss->type == OB_FLUIDSIM_DOMAIN) {
for (base = scene->base.first; base; base = base->next) { for (base = ctx->scene->base.first; base; base = base->next) {
Object *ob1 = base->object; Object *ob1 = base->object;
if (ob1 != ob) { if (ob1 != ctx->object) {
FluidsimModifierData *fluidmdtmp = FluidsimModifierData *fluidmdtmp =
(FluidsimModifierData *)modifiers_findByType(ob1, eModifierType_Fluidsim); (FluidsimModifierData *)modifiers_findByType(ob1, eModifierType_Fluidsim);
/* only put dependencies from NON-DOMAIN fluids in here */ /* only put dependencies from NON-DOMAIN fluids in here */
if (fluidmdtmp && fluidmdtmp->fss && (fluidmdtmp->fss->type != OB_FLUIDSIM_DOMAIN)) { if (fluidmdtmp && fluidmdtmp->fss && (fluidmdtmp->fss->type != OB_FLUIDSIM_DOMAIN)) {
DagNode *curNode = dag_get_node(forest, ob1); DagNode *curNode = dag_get_node(ctx->forest, ob1);
dag_add_relation(forest, curNode, obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Fluidsim Object"); dag_add_relation(ctx->forest, curNode, ctx->obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Fluidsim Object");
} }
} }
} }
@@ -130,25 +127,21 @@ static void updateDepgraph(
} }
} }
static void updateDepsgraph(ModifierData *md, static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *scene,
Object *ob,
struct DepsNodeHandle *node)
{ {
FluidsimModifierData *fluidmd = (FluidsimModifierData *) md; FluidsimModifierData *fluidmd = (FluidsimModifierData *) md;
if (fluidmd && fluidmd->fss) { if (fluidmd && fluidmd->fss) {
if (fluidmd->fss->type == OB_FLUIDSIM_DOMAIN) { if (fluidmd->fss->type == OB_FLUIDSIM_DOMAIN) {
Base *base; Base *base;
for (base = scene->base.first; base; base = base->next) { for (base = ctx->scene->base.first; base; base = base->next) {
Object *ob1 = base->object; Object *ob1 = base->object;
if (ob1 != ob) { if (ob1 != ctx->object) {
FluidsimModifierData *fluidmdtmp = FluidsimModifierData *fluidmdtmp =
(FluidsimModifierData *)modifiers_findByType(ob1, eModifierType_Fluidsim); (FluidsimModifierData *)modifiers_findByType(ob1, eModifierType_Fluidsim);
/* Only put dependencies from NON-DOMAIN fluids in here. */ /* Only put dependencies from NON-DOMAIN fluids in here. */
if (fluidmdtmp && fluidmdtmp->fss && (fluidmdtmp->fss->type != OB_FLUIDSIM_DOMAIN)) { if (fluidmdtmp && fluidmdtmp->fss && (fluidmdtmp->fss->type != OB_FLUIDSIM_DOMAIN)) {
DEG_add_object_relation(node, ob1, DEG_OB_COMP_TRANSFORM, "Fluidsim Object"); DEG_add_object_relation(ctx->node, ob1, DEG_OB_COMP_TRANSFORM, "Fluidsim Object");
} }
} }
} }

24
source/blender/modifiers/intern/MOD_hook.c
View File

@@ -118,39 +118,31 @@ static void foreachObjectLink(
walk(userData, ob, &hmd->object, IDWALK_CB_NOP); walk(userData, ob, &hmd->object, IDWALK_CB_NOP);
} }
static void updateDepgraph(ModifierData *md, DagForest *forest, static void updateDepgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *UNUSED(scene),
Object *UNUSED(ob),
DagNode *obNode)
{ {
HookModifierData *hmd = (HookModifierData *) md; HookModifierData *hmd = (HookModifierData *) md;
if (hmd->object) { if (hmd->object) {
DagNode *curNode = dag_get_node(forest, hmd->object); DagNode *curNode = dag_get_node(ctx->forest, hmd->object);
if (hmd->subtarget[0]) if (hmd->subtarget[0])
dag_add_relation(forest, curNode, obNode, DAG_RL_OB_DATA | DAG_RL_DATA_DATA, "Hook Modifier"); dag_add_relation(ctx->forest, curNode, ctx->obNode, DAG_RL_OB_DATA | DAG_RL_DATA_DATA, "Hook Modifier");
else else
dag_add_relation(forest, curNode, obNode, DAG_RL_OB_DATA, "Hook Modifier"); dag_add_relation(ctx->forest, curNode, ctx->obNode, DAG_RL_OB_DATA, "Hook Modifier");
} }
} }
static void updateDepsgraph(ModifierData *md, static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *UNUSED(scene),
Object *ob,
struct DepsNodeHandle *node)
{ {
HookModifierData *hmd = (HookModifierData *)md; HookModifierData *hmd = (HookModifierData *)md;
if (hmd->object != NULL) { if (hmd->object != NULL) {
if (hmd->subtarget[0]) { if (hmd->subtarget[0]) {
DEG_add_bone_relation(node, hmd->object, hmd->subtarget, DEG_OB_COMP_BONE, "Hook Modifier"); DEG_add_bone_relation(ctx->node, hmd->object, hmd->subtarget, DEG_OB_COMP_BONE, "Hook Modifier");
} }
DEG_add_object_relation(node, hmd->object, DEG_OB_COMP_TRANSFORM, "Hook Modifier"); DEG_add_object_relation(ctx->node, hmd->object, DEG_OB_COMP_TRANSFORM, "Hook Modifier");
} }
/* We need own transformation as well. */ /* We need own transformation as well. */
DEG_add_object_relation(node, ob, DEG_OB_COMP_TRANSFORM, "Hook Modifier"); DEG_add_object_relation(ctx->node, ctx->object, DEG_OB_COMP_TRANSFORM, "Hook Modifier");
} }
struct HookData_cb { struct HookData_cb {

22
source/blender/modifiers/intern/MOD_lattice.c
View File

@@ -91,34 +91,26 @@ static void foreachObjectLink(
walk(userData, ob, &lmd->object, IDWALK_CB_NOP); walk(userData, ob, &lmd->object, IDWALK_CB_NOP);
} }
static void updateDepgraph(ModifierData *md, DagForest *forest, static void updateDepgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *UNUSED(scene),
Object *UNUSED(ob),
DagNode *obNode)
{ {
LatticeModifierData *lmd = (LatticeModifierData *) md; LatticeModifierData *lmd = (LatticeModifierData *) md;
if (lmd->object) { if (lmd->object) {
DagNode *latNode = dag_get_node(forest, lmd->object); DagNode *latNode = dag_get_node(ctx->forest, lmd->object);
dag_add_relation(forest, latNode, obNode, dag_add_relation(ctx->forest, latNode, ctx->obNode,
DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Lattice Modifier"); DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Lattice Modifier");
} }
} }
static void updateDepsgraph(ModifierData *md, static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *UNUSED(scene),
Object *object,
struct DepsNodeHandle *node)
{ {
LatticeModifierData *lmd = (LatticeModifierData *)md; LatticeModifierData *lmd = (LatticeModifierData *)md;
if (lmd->object != NULL) { if (lmd->object != NULL) {
DEG_add_object_relation(node, lmd->object, DEG_OB_COMP_GEOMETRY, "Lattice Modifier"); DEG_add_object_relation(ctx->node, lmd->object, DEG_OB_COMP_GEOMETRY, "Lattice Modifier");
DEG_add_object_relation(node, lmd->object, DEG_OB_COMP_TRANSFORM, "Lattice Modifier"); DEG_add_object_relation(ctx->node, lmd->object, DEG_OB_COMP_TRANSFORM, "Lattice Modifier");
} }
DEG_add_object_relation(node, object, DEG_OB_COMP_TRANSFORM, "Lattice Modifier"); DEG_add_object_relation(ctx->node, ctx->object, DEG_OB_COMP_TRANSFORM, "Lattice Modifier");
} }
static void deformVerts(ModifierData *md, Object *ob, static void deformVerts(ModifierData *md, Object *ob,

18
source/blender/modifiers/intern/MOD_mask.c
View File

@@ -79,36 +79,28 @@ static void foreachObjectLink(
walk(userData, ob, &mmd->ob_arm, IDWALK_CB_NOP); walk(userData, ob, &mmd->ob_arm, IDWALK_CB_NOP);
} }
static void updateDepgraph(ModifierData *md, DagForest *forest, static void updateDepgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *UNUSED(scene),
Object *UNUSED(ob),
DagNode *obNode)
{ {
MaskModifierData *mmd = (MaskModifierData *)md; MaskModifierData *mmd = (MaskModifierData *)md;
if (mmd->ob_arm) { if (mmd->ob_arm) {
bArmature *arm = (bArmature *)mmd->ob_arm->data; bArmature *arm = (bArmature *)mmd->ob_arm->data;
DagNode *armNode = dag_get_node(forest, mmd->ob_arm); DagNode *armNode = dag_get_node(ctx->forest, mmd->ob_arm);
/* tag relationship in depsgraph, but also on the armature */ /* 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"); dag_add_relation(ctx->forest, armNode, ctx->obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Mask Modifier");
arm->flag |= ARM_HAS_VIZ_DEPS; arm->flag |= ARM_HAS_VIZ_DEPS;
} }
} }
static void updateDepsgraph(ModifierData *md, static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *UNUSED(scene),
Object *UNUSED(ob),
struct DepsNodeHandle *node)
{ {
MaskModifierData *mmd = (MaskModifierData *)md; MaskModifierData *mmd = (MaskModifierData *)md;
if (mmd->ob_arm) { if (mmd->ob_arm) {
bArmature *arm = (bArmature *)mmd->ob_arm->data; bArmature *arm = (bArmature *)mmd->ob_arm->data;
/* Tag relationship in depsgraph, but also on the armature. */ /* Tag relationship in depsgraph, but also on the armature. */
/* TODO(sergey): Is it a proper relation here? */ /* TODO(sergey): Is it a proper relation here? */
DEG_add_object_relation(node, mmd->ob_arm, DEG_OB_COMP_TRANSFORM, "Mask Modifier"); DEG_add_object_relation(ctx->node, mmd->ob_arm, DEG_OB_COMP_TRANSFORM, "Mask Modifier");
arm->flag |= ARM_HAS_VIZ_DEPS; arm->flag |= ARM_HAS_VIZ_DEPS;
} }
} }

18
source/blender/modifiers/intern/MOD_meshdeform.c
View File

@@ -122,33 +122,25 @@ static void foreachObjectLink(
walk(userData, ob, &mmd->object, IDWALK_CB_NOP); walk(userData, ob, &mmd->object, IDWALK_CB_NOP);
} }
static void updateDepgraph(ModifierData *md, DagForest *forest, static void updateDepgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *UNUSED(scene),
Object *UNUSED(ob),
DagNode *obNode)
{ {
MeshDeformModifierData *mmd = (MeshDeformModifierData *) md; MeshDeformModifierData *mmd = (MeshDeformModifierData *) md;
if (mmd->object) { if (mmd->object) {
DagNode *curNode = dag_get_node(forest, mmd->object); DagNode *curNode = dag_get_node(ctx->forest, mmd->object);
dag_add_relation(forest, curNode, obNode, dag_add_relation(ctx->forest, curNode, ctx->obNode,
DAG_RL_DATA_DATA | DAG_RL_OB_DATA | DAG_RL_DATA_OB | DAG_RL_OB_OB, DAG_RL_DATA_DATA | DAG_RL_OB_DATA | DAG_RL_DATA_OB | DAG_RL_OB_OB,
"Mesh Deform Modifier"); "Mesh Deform Modifier");
} }
} }
static void updateDepsgraph(ModifierData *md, static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *UNUSED(scene),
Object *UNUSED(ob),
struct DepsNodeHandle *node)
{ {
MeshDeformModifierData *mmd = (MeshDeformModifierData *)md; MeshDeformModifierData *mmd = (MeshDeformModifierData *)md;
if (mmd->object != NULL) { if (mmd->object != NULL) {
/* TODO(sergey): Do we need transform component here? */ /* TODO(sergey): Do we need transform component here? */
DEG_add_object_relation(node, mmd->object, DEG_OB_COMP_GEOMETRY, "Mesh Deform Modifier"); DEG_add_object_relation(ctx->node, mmd->object, DEG_OB_COMP_GEOMETRY, "Mesh Deform Modifier");
} }
} }

21
source/blender/modifiers/intern/MOD_meshsequencecache.c
View File

@@ -174,36 +174,25 @@ static void foreachIDLink(ModifierData *md, Object *ob,
} }
static void updateDepgraph(ModifierData *md, DagForest *forest, static void updateDepgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *bmain,
struct Scene *scene,
Object *ob, DagNode *obNode)
{ {
MeshSeqCacheModifierData *mcmd = (MeshSeqCacheModifierData *) md; MeshSeqCacheModifierData *mcmd = (MeshSeqCacheModifierData *) md;
if (mcmd->cache_file != NULL) { if (mcmd->cache_file != NULL) {
DagNode *curNode = dag_get_node(forest, mcmd->cache_file); DagNode *curNode = dag_get_node(ctx->forest, mcmd->cache_file);
dag_add_relation(forest, curNode, obNode, dag_add_relation(ctx->forest, curNode, ctx->obNode,
DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Cache File Modifier"); DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Cache File Modifier");
} }
UNUSED_VARS(bmain, scene, ob);
} }
static void updateDepsgraph(ModifierData *md, static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *bmain,
struct Scene *scene,
Object *ob,
struct DepsNodeHandle *node)
{ {
MeshSeqCacheModifierData *mcmd = (MeshSeqCacheModifierData *) md; MeshSeqCacheModifierData *mcmd = (MeshSeqCacheModifierData *) md;
if (mcmd->cache_file != NULL) { if (mcmd->cache_file != NULL) {
DEG_add_object_cache_relation(node, mcmd->cache_file, DEG_OB_COMP_CACHE, "Mesh Cache File"); DEG_add_object_cache_relation(ctx->node, mcmd->cache_file, DEG_OB_COMP_CACHE, "Mesh Cache File");
} }
UNUSED_VARS(bmain, scene, ob);
} }
ModifierTypeInfo modifierType_MeshSequenceCache = { ModifierTypeInfo modifierType_MeshSequenceCache = {

20
source/blender/modifiers/intern/MOD_mirror.c
View File

@@ -77,32 +77,24 @@ static void foreachObjectLink(
walk(userData, ob, &mmd->mirror_ob, IDWALK_CB_NOP); walk(userData, ob, &mmd->mirror_ob, IDWALK_CB_NOP);
} }
static void updateDepgraph(ModifierData *md, DagForest *forest, static void updateDepgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *UNUSED(scene),
Object *UNUSED(ob),
DagNode *obNode)
{ {
MirrorModifierData *mmd = (MirrorModifierData *) md; MirrorModifierData *mmd = (MirrorModifierData *) md;
if (mmd->mirror_ob) { if (mmd->mirror_ob) {
DagNode *latNode = dag_get_node(forest, mmd->mirror_ob); DagNode *latNode = dag_get_node(ctx->forest, mmd->mirror_ob);
dag_add_relation(forest, latNode, obNode, DAG_RL_OB_DATA, "Mirror Modifier"); dag_add_relation(ctx->forest, latNode, ctx->obNode, DAG_RL_OB_DATA, "Mirror Modifier");
} }
} }
static void updateDepsgraph(ModifierData *md, static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *UNUSED(scene),
Object *ob,
struct DepsNodeHandle *node)
{ {
MirrorModifierData *mmd = (MirrorModifierData *)md; MirrorModifierData *mmd = (MirrorModifierData *)md;
if (mmd->mirror_ob != NULL) { if (mmd->mirror_ob != NULL) {
DEG_add_object_relation(node, mmd->mirror_ob, DEG_OB_COMP_TRANSFORM, "Mirror Modifier"); DEG_add_object_relation(ctx->node, mmd->mirror_ob, DEG_OB_COMP_TRANSFORM, "Mirror Modifier");
} }
DEG_add_object_relation(node, ob, DEG_OB_COMP_TRANSFORM, "Mirror Modifier"); DEG_add_object_relation(ctx->node, ctx->object, DEG_OB_COMP_TRANSFORM, "Mirror Modifier");
} }
static DerivedMesh *doMirrorOnAxis(MirrorModifierData *mmd, static DerivedMesh *doMirrorOnAxis(MirrorModifierData *mmd,

17
source/blender/modifiers/intern/MOD_normal_edit.c
View File

@@ -511,29 +511,22 @@ static bool isDisabled(ModifierData *md, int UNUSED(useRenderParams))
return !is_valid_target(enmd); return !is_valid_target(enmd);
} }
static void updateDepgraph(ModifierData *md, DagForest *forest, static void updateDepgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *UNUSED(scene),
Object *UNUSED(ob), DagNode *obNode)
{ {
NormalEditModifierData *enmd = (NormalEditModifierData *) md; NormalEditModifierData *enmd = (NormalEditModifierData *) md;
if (enmd->target) { if (enmd->target) {
DagNode *Node = dag_get_node(forest, enmd->target); DagNode *Node = dag_get_node(ctx->forest, enmd->target);
dag_add_relation(forest, Node, obNode, DAG_RL_OB_DATA, "NormalEdit Modifier"); dag_add_relation(ctx->forest, Node, ctx->obNode, DAG_RL_OB_DATA, "NormalEdit Modifier");
} }
} }
static void updateDepsgraph(ModifierData *md, static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *UNUSED(scene),
Object *UNUSED(ob),
struct DepsNodeHandle *node)
{ {
NormalEditModifierData *enmd = (NormalEditModifierData *) md; NormalEditModifierData *enmd = (NormalEditModifierData *) md;
if (enmd->target) { if (enmd->target) {
DEG_add_object_relation(node, enmd->target, DEG_OB_COMP_TRANSFORM, "NormalEdit Modifier"); DEG_add_object_relation(ctx->node, enmd->target, DEG_OB_COMP_TRANSFORM, "NormalEdit Modifier");
} }
} }

18
source/blender/modifiers/intern/MOD_particleinstance.c
View File

@@ -113,32 +113,24 @@ static bool isDisabled(ModifierData *md, int useRenderParams)
} }
static void updateDepgraph(ModifierData *md, DagForest *forest, static void updateDepgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *UNUSED(scene),
Object *UNUSED(ob),
DagNode *obNode)
{ {
ParticleInstanceModifierData *pimd = (ParticleInstanceModifierData *) md; ParticleInstanceModifierData *pimd = (ParticleInstanceModifierData *) md;
if (pimd->ob) { if (pimd->ob) {
DagNode *curNode = dag_get_node(forest, pimd->ob); DagNode *curNode = dag_get_node(ctx->forest, pimd->ob);
dag_add_relation(forest, curNode, obNode, dag_add_relation(ctx->forest, curNode, ctx->obNode,
DAG_RL_DATA_DATA | DAG_RL_OB_DATA, DAG_RL_DATA_DATA | DAG_RL_OB_DATA,
"Particle Instance Modifier"); "Particle Instance Modifier");
} }
} }
static void updateDepsgraph(ModifierData *md, static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *UNUSED(scene),
Object *UNUSED(ob),
struct DepsNodeHandle *node)
{ {
ParticleInstanceModifierData *pimd = (ParticleInstanceModifierData *) md; ParticleInstanceModifierData *pimd = (ParticleInstanceModifierData *) md;
if (pimd->ob != NULL) { if (pimd->ob != NULL) {
DEG_add_object_relation(node, pimd->ob, DEG_OB_COMP_TRANSFORM, "Particle Instance Modifier"); DEG_add_object_relation(ctx->node, pimd->ob, DEG_OB_COMP_TRANSFORM, "Particle Instance Modifier");
} }
} }

18
source/blender/modifiers/intern/MOD_screw.c
View File

@@ -1119,32 +1119,24 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
} }
static void updateDepgraph(ModifierData *md, DagForest *forest, static void updateDepgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *UNUSED(scene),
Object *UNUSED(ob),
DagNode *obNode)
{ {
ScrewModifierData *ltmd = (ScrewModifierData *) md; ScrewModifierData *ltmd = (ScrewModifierData *) md;
if (ltmd->ob_axis) { if (ltmd->ob_axis) {
DagNode *curNode = dag_get_node(forest, ltmd->ob_axis); DagNode *curNode = dag_get_node(ctx->forest, ltmd->ob_axis);
dag_add_relation(forest, curNode, obNode, dag_add_relation(ctx->forest, curNode, ctx->obNode,
DAG_RL_DATA_DATA | DAG_RL_OB_DATA, DAG_RL_DATA_DATA | DAG_RL_OB_DATA,
"Screw Modifier"); "Screw Modifier");
} }
} }
static void updateDepsgraph(ModifierData *md, static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *UNUSED(scene),
Object *UNUSED(ob),
struct DepsNodeHandle *node)
{ {
ScrewModifierData *ltmd = (ScrewModifierData *)md; ScrewModifierData *ltmd = (ScrewModifierData *)md;
if (ltmd->ob_axis != NULL) { if (ltmd->ob_axis != NULL) {
DEG_add_object_relation(node, ltmd->ob_axis, DEG_OB_COMP_TRANSFORM, "Screw Modifier"); DEG_add_object_relation(ctx->node, ltmd->ob_axis, DEG_OB_COMP_TRANSFORM, "Screw Modifier");
} }
} }

24
source/blender/modifiers/intern/MOD_shrinkwrap.c
View File

@@ -143,37 +143,29 @@ static void deformVertsEM(ModifierData *md, Object *ob, struct BMEditMesh *editD
dm->release(dm); dm->release(dm);
} }
static void updateDepgraph(ModifierData *md, DagForest *forest, static void updateDepgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *UNUSED(scene),
Object *UNUSED(ob),
DagNode *obNode)
{ {
ShrinkwrapModifierData *smd = (ShrinkwrapModifierData *) md; ShrinkwrapModifierData *smd = (ShrinkwrapModifierData *) md;
if (smd->target) if (smd->target)
dag_add_relation(forest, dag_get_node(forest, smd->target), obNode, dag_add_relation(ctx->forest, dag_get_node(ctx->forest, smd->target), ctx->obNode,
DAG_RL_OB_DATA | DAG_RL_DATA_DATA, "Shrinkwrap Modifier"); DAG_RL_OB_DATA | DAG_RL_DATA_DATA, "Shrinkwrap Modifier");
if (smd->auxTarget) if (smd->auxTarget)
dag_add_relation(forest, dag_get_node(forest, smd->auxTarget), obNode, dag_add_relation(ctx->forest, dag_get_node(ctx->forest, smd->auxTarget), ctx->obNode,
DAG_RL_OB_DATA | DAG_RL_DATA_DATA, "Shrinkwrap Modifier"); DAG_RL_OB_DATA | DAG_RL_DATA_DATA, "Shrinkwrap Modifier");
} }
static void updateDepsgraph(ModifierData *md, static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *UNUSED(scene),
Object *UNUSED(ob),
struct DepsNodeHandle *node)
{ {
ShrinkwrapModifierData *smd = (ShrinkwrapModifierData *)md; ShrinkwrapModifierData *smd = (ShrinkwrapModifierData *)md;
if (smd->target != NULL) { if (smd->target != NULL) {
DEG_add_object_relation(node, smd->target, DEG_OB_COMP_TRANSFORM, "Shrinkwrap Modifier"); DEG_add_object_relation(ctx->node, smd->target, DEG_OB_COMP_TRANSFORM, "Shrinkwrap Modifier");
DEG_add_object_relation(node, smd->target, DEG_OB_COMP_GEOMETRY, "Shrinkwrap Modifier"); DEG_add_object_relation(ctx->node, smd->target, DEG_OB_COMP_GEOMETRY, "Shrinkwrap Modifier");
} }
if (smd->auxTarget != NULL) { if (smd->auxTarget != NULL) {
DEG_add_object_relation(node, smd->auxTarget, DEG_OB_COMP_TRANSFORM, "Shrinkwrap Modifier"); DEG_add_object_relation(ctx->node, smd->auxTarget, DEG_OB_COMP_TRANSFORM, "Shrinkwrap Modifier");
DEG_add_object_relation(node, smd->auxTarget, DEG_OB_COMP_GEOMETRY, "Shrinkwrap Modifier"); DEG_add_object_relation(ctx->node, smd->auxTarget, DEG_OB_COMP_GEOMETRY, "Shrinkwrap Modifier");
} }
} }

16
source/blender/modifiers/intern/MOD_simpledeform.c
View File

@@ -378,27 +378,19 @@ static void foreachObjectLink(
walk(userData, ob, &smd->origin, IDWALK_CB_NOP); walk(userData, ob, &smd->origin, IDWALK_CB_NOP);
} }
static void updateDepgraph(ModifierData *md, DagForest *forest, static void updateDepgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *UNUSED(scene),
Object *UNUSED(ob),
DagNode *obNode)
{ {
SimpleDeformModifierData *smd = (SimpleDeformModifierData *)md; SimpleDeformModifierData *smd = (SimpleDeformModifierData *)md;
if (smd->origin) if (smd->origin)
dag_add_relation(forest, dag_get_node(forest, smd->origin), obNode, DAG_RL_OB_DATA, "SimpleDeform Modifier"); dag_add_relation(ctx->forest, dag_get_node(ctx->forest, smd->origin), ctx->obNode, DAG_RL_OB_DATA, "SimpleDeform Modifier");
} }
static void updateDepsgraph(ModifierData *md, static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *UNUSED(scene),
Object *UNUSED(ob),
struct DepsNodeHandle *node)
{ {
SimpleDeformModifierData *smd = (SimpleDeformModifierData *)md; SimpleDeformModifierData *smd = (SimpleDeformModifierData *)md;
if (smd->origin != NULL) { if (smd->origin != NULL) {
DEG_add_object_relation(node, smd->origin, DEG_OB_COMP_TRANSFORM, "SimpleDeform Modifier"); DEG_add_object_relation(ctx->node, smd->origin, DEG_OB_COMP_TRANSFORM, "SimpleDeform Modifier");
} }
} }

28
source/blender/modifiers/intern/MOD_smoke.c
View File

@@ -130,42 +130,32 @@ static bool is_coll_cb(Object *UNUSED(ob), ModifierData *md)
return (smd->type & MOD_SMOKE_TYPE_COLL) && smd->coll; return (smd->type & MOD_SMOKE_TYPE_COLL) && smd->coll;
} }
static void updateDepgraph(ModifierData *md, DagForest *forest, static void updateDepgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *scene, struct Object *ob,
DagNode *obNode)
{ {
SmokeModifierData *smd = (SmokeModifierData *) md; SmokeModifierData *smd = (SmokeModifierData *) md;
if (smd && (smd->type & MOD_SMOKE_TYPE_DOMAIN) && smd->domain) { if (smd && (smd->type & MOD_SMOKE_TYPE_DOMAIN) && smd->domain) {
/* Actual code uses get_collisionobjects */ /* Actual code uses get_collisionobjects */
#ifdef WITH_LEGACY_DEPSGRAPH #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(ctx->forest, ctx->scene, ctx->object, ctx->obNode, smd->domain->fluid_group, ctx->object->lay|ctx->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_collision_relations(ctx->forest, ctx->scene, ctx->object, ctx->obNode, smd->domain->coll_group, ctx->object->lay|ctx->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"); dag_add_forcefield_relations(ctx->forest, ctx->scene, ctx->object, ctx->obNode, smd->domain->effector_weights, true, PFIELD_SMOKEFLOW, "Smoke Force Field");
#else #else
(void)forest; (void)ctx;
(void)scene;
(void)ob;
(void)obNode;
#endif #endif
} }
} }
static void updateDepsgraph(ModifierData *md, static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *scene,
Object *ob,
struct DepsNodeHandle *node)
{ {
SmokeModifierData *smd = (SmokeModifierData *)md; SmokeModifierData *smd = (SmokeModifierData *)md;
if (smd && (smd->type & MOD_SMOKE_TYPE_DOMAIN) && smd->domain) { if (smd && (smd->type & MOD_SMOKE_TYPE_DOMAIN) && smd->domain) {
/* Actual code uses get_collisionobjects */ /* Actual code uses get_collisionobjects */
DEG_add_collision_relations(node, scene, ob, smd->domain->fluid_group, ob->lay|scene->lay, eModifierType_Smoke, is_flow_cb, true, "Smoke Flow"); DEG_add_collision_relations(ctx->node, ctx->scene, ctx->object, smd->domain->fluid_group, ctx->object->lay|ctx->scene->lay, eModifierType_Smoke, is_flow_cb, true, "Smoke Flow");
DEG_add_collision_relations(node, scene, ob, smd->domain->coll_group, ob->lay|scene->lay, eModifierType_Smoke, is_coll_cb, true, "Smoke Coll"); DEG_add_collision_relations(ctx->node, ctx->scene, ctx->object, smd->domain->coll_group, ctx->object->lay|ctx->scene->lay, eModifierType_Smoke, is_coll_cb, true, "Smoke Coll");
DEG_add_forcefield_relations(node, scene, ob, smd->domain->effector_weights, true, PFIELD_SMOKEFLOW, "Smoke Force Field"); DEG_add_forcefield_relations(ctx->node, ctx->scene, ctx->object, smd->domain->effector_weights, true, PFIELD_SMOKEFLOW, "Smoke Force Field");
} }
} }

27
source/blender/modifiers/intern/MOD_softbody.c
View File

@@ -62,36 +62,27 @@ static bool dependsOnTime(ModifierData *UNUSED(md))
return true; return true;
} }
static void updateDepgraph(ModifierData *UNUSED(md), DagForest *forest, static void updateDepgraph(ModifierData *UNUSED(md), const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
Scene *scene, Object *ob, DagNode *obNode)
{ {
if (ob->soft) { if (ctx->object->soft) {
#ifdef WITH_LEGACY_DEPSGRAPH #ifdef WITH_LEGACY_DEPSGRAPH
/* Actual code uses ccd_build_deflector_hash */ /* 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_collision_relations(ctx->forest, ctx->scene, ctx->object, ctx->obNode, ctx->object->soft->collision_group, ctx->object->lay, eModifierType_Collision, NULL, false, "Softbody Collision");
dag_add_forcefield_relations(forest, scene, ob, obNode, ob->soft->effector_weights, true, 0, "Softbody Field"); dag_add_forcefield_relations(ctx->forest, ctx->scene, ctx->object, ctx->obNode, ctx->object->soft->effector_weights, true, 0, "Softbody Field");
#else #else
(void)forest; (void)ctx;
(void)scene;
(void)ob;
(void)obNode;
#endif #endif
} }
} }
static void updateDepsgraph(ModifierData *UNUSED(md), static void updateDepsgraph(ModifierData *UNUSED(md), const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *scene,
Object *ob,
struct DepsNodeHandle *node)
{ {
if (ob->soft) { if (ctx->object->soft) {
/* Actual code uses ccd_build_deflector_hash */ /* Actual code uses ccd_build_deflector_hash */
DEG_add_collision_relations(node, scene, ob, ob->soft->collision_group, ob->lay, eModifierType_Collision, NULL, false, "Softbody Collision"); DEG_add_collision_relations(ctx->node, ctx->scene, ctx->object, ctx->object->soft->collision_group, ctx->object->lay, eModifierType_Collision, NULL, false, "Softbody Collision");
DEG_add_forcefield_relations(node, scene, ob, ob->soft->effector_weights, true, 0, "Softbody Field"); DEG_add_forcefield_relations(ctx->node, ctx->scene, ctx->object, ctx->object->soft->effector_weights, true, 0, "Softbody Field");
} }
} }

18
source/blender/modifiers/intern/MOD_surfacedeform.c
View File

@@ -170,30 +170,22 @@ static void foreachObjectLink(ModifierData *md, Object *ob, ObjectWalkFunc walk,
walk(userData, ob, &smd->target, IDWALK_NOP); walk(userData, ob, &smd->target, IDWALK_NOP);
} }
static void updateDepgraph(ModifierData *md, DagForest *forest, static void updateDepgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *UNUSED(scene),
Object *UNUSED(ob),
DagNode *obNode)
{ {
SurfaceDeformModifierData *smd = (SurfaceDeformModifierData *)md; SurfaceDeformModifierData *smd = (SurfaceDeformModifierData *)md;
if (smd->target) { if (smd->target) {
DagNode *curNode = dag_get_node(forest, smd->target); DagNode *curNode = dag_get_node(ctx->forest, smd->target);
dag_add_relation(forest, curNode, obNode, DAG_RL_DATA_DATA, "Surface Deform Modifier"); dag_add_relation(ctx->forest, curNode, ctx->obNode, DAG_RL_DATA_DATA, "Surface Deform Modifier");
} }
} }
static void updateDepsgraph(ModifierData *md, static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *UNUSED(scene),
Object *UNUSED(ob),
struct DepsNodeHandle *node)
{ {
SurfaceDeformModifierData *smd = (SurfaceDeformModifierData *)md; SurfaceDeformModifierData *smd = (SurfaceDeformModifierData *)md;
if (smd->target != NULL) { if (smd->target != NULL) {
DEG_add_object_relation(node, smd->target, DEG_OB_COMP_GEOMETRY, "Surface Deform Modifier"); DEG_add_object_relation(ctx->node, smd->target, DEG_OB_COMP_GEOMETRY, "Surface Deform Modifier");
} }
} }

18
source/blender/modifiers/intern/MOD_uvproject.c
View File

@@ -109,36 +109,28 @@ static void foreachIDLink(ModifierData *md, Object *ob,
foreachObjectLink(md, ob, (ObjectWalkFunc)walk, userData); foreachObjectLink(md, ob, (ObjectWalkFunc)walk, userData);
} }
static void updateDepgraph(ModifierData *md, DagForest *forest, static void updateDepgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *UNUSED(scene),
Object *UNUSED(ob),
DagNode *obNode)
{ {
UVProjectModifierData *umd = (UVProjectModifierData *) md; UVProjectModifierData *umd = (UVProjectModifierData *) md;
int i; int i;
for (i = 0; i < umd->num_projectors; ++i) { for (i = 0; i < umd->num_projectors; ++i) {
if (umd->projectors[i]) { if (umd->projectors[i]) {
DagNode *curNode = dag_get_node(forest, umd->projectors[i]); DagNode *curNode = dag_get_node(ctx->forest, umd->projectors[i]);
dag_add_relation(forest, curNode, obNode, dag_add_relation(ctx->forest, curNode, ctx->obNode,
DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "UV Project Modifier"); DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "UV Project Modifier");
} }
} }
} }
static void updateDepsgraph(ModifierData *md, static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *UNUSED(scene),
Object *UNUSED(ob),
struct DepsNodeHandle *node)
{ {
UVProjectModifierData *umd = (UVProjectModifierData *)md; UVProjectModifierData *umd = (UVProjectModifierData *)md;
int i; int i;
for (i = 0; i < umd->num_projectors; ++i) { for (i = 0; i < umd->num_projectors; ++i) {
if (umd->projectors[i] != NULL) { if (umd->projectors[i] != NULL) {
DEG_add_object_relation(node, umd->projectors[i], DEG_OB_COMP_TRANSFORM, "UV Project Modifier"); DEG_add_object_relation(ctx->node, umd->projectors[i], DEG_OB_COMP_TRANSFORM, "UV Project Modifier");
} }
} }
} }

22
source/blender/modifiers/intern/MOD_uvwarp.c
View File

@@ -235,7 +235,7 @@ static void foreachObjectLink(ModifierData *md, Object *ob, ObjectWalkFunc walk,
} }
static void uv_warp_deps_object_bone(DagForest *forest, DagNode *obNode, static void uv_warp_deps_object_bone(DagForest *forest, DagNode *obNode,
Object *obj, const char *bonename) Object *obj, const char *bonename)
{ {
if (obj) { if (obj) {
DagNode *curNode = dag_get_node(forest, obj); DagNode *curNode = dag_get_node(forest, obj);
@@ -247,16 +247,12 @@ static void uv_warp_deps_object_bone(DagForest *forest, DagNode *obNode,
} }
} }
static void updateDepgraph(ModifierData *md, DagForest *forest, static void updateDepgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *UNUSED(scene),
Object *UNUSED(ob),
DagNode *obNode)
{ {
UVWarpModifierData *umd = (UVWarpModifierData *) md; UVWarpModifierData *umd = (UVWarpModifierData *) md;
uv_warp_deps_object_bone(forest, obNode, umd->object_src, umd->bone_src); uv_warp_deps_object_bone(ctx->forest, ctx->obNode, umd->object_src, umd->bone_src);
uv_warp_deps_object_bone(forest, obNode, umd->object_dst, umd->bone_dst); uv_warp_deps_object_bone(ctx->forest, ctx->obNode, umd->object_dst, umd->bone_dst);
} }
static void uv_warp_deps_object_bone_new(struct DepsNodeHandle *node, static void uv_warp_deps_object_bone_new(struct DepsNodeHandle *node,
@@ -271,16 +267,12 @@ static void uv_warp_deps_object_bone_new(struct DepsNodeHandle *node,
} }
} }
static void updateDepsgraph(ModifierData *md, static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *UNUSED(scene),
Object *UNUSED(ob),
struct DepsNodeHandle *node)
{ {
UVWarpModifierData *umd = (UVWarpModifierData *) md; UVWarpModifierData *umd = (UVWarpModifierData *) md;
uv_warp_deps_object_bone_new(node, umd->object_src, umd->bone_src); uv_warp_deps_object_bone_new(ctx->node, umd->object_src, umd->bone_src);
uv_warp_deps_object_bone_new(node, umd->object_dst, umd->bone_dst); uv_warp_deps_object_bone_new(ctx->node, umd->object_dst, umd->bone_dst);
} }
ModifierTypeInfo modifierType_UVWarp = { ModifierTypeInfo modifierType_UVWarp = {

29
source/blender/modifiers/intern/MOD_warp.c
View File

@@ -139,40 +139,33 @@ static void foreachTexLink(ModifierData *md, Object *ob, TexWalkFunc walk, void
walk(userData, ob, md, "texture"); walk(userData, ob, md, "texture");
} }
static void updateDepgraph(ModifierData *md, DagForest *forest, static void updateDepgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *UNUSED(scene),
Object *UNUSED(ob), DagNode *obNode)
{ {
WarpModifierData *wmd = (WarpModifierData *) md; WarpModifierData *wmd = (WarpModifierData *) md;
if (wmd->object_from && wmd->object_to) { if (wmd->object_from && wmd->object_to) {
DagNode *fromNode = dag_get_node(forest, wmd->object_from); DagNode *fromNode = dag_get_node(ctx->forest, wmd->object_from);
DagNode *toNode = dag_get_node(forest, wmd->object_to); DagNode *toNode = dag_get_node(ctx->forest, wmd->object_to);
dag_add_relation(forest, fromNode, obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Warp Modifier1"); dag_add_relation(ctx->forest, fromNode, ctx->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"); dag_add_relation(ctx->forest, toNode, ctx->obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Warp Modifier2");
} }
if ((wmd->texmapping == MOD_DISP_MAP_OBJECT) && wmd->map_object) { if ((wmd->texmapping == MOD_DISP_MAP_OBJECT) && wmd->map_object) {
DagNode *curNode = dag_get_node(forest, wmd->map_object); DagNode *curNode = dag_get_node(ctx->forest, wmd->map_object);
dag_add_relation(forest, curNode, obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Warp Modifier3"); dag_add_relation(ctx->forest, curNode, ctx->obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Warp Modifier3");
} }
} }
static void updateDepsgraph(ModifierData *md, static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *UNUSED(scene),
Object *UNUSED(ob),
struct DepsNodeHandle *node)
{ {
WarpModifierData *wmd = (WarpModifierData *) md; WarpModifierData *wmd = (WarpModifierData *) md;
if (wmd->object_from != NULL && wmd->object_to != NULL) { if (wmd->object_from != NULL && wmd->object_to != NULL) {
DEG_add_object_relation(node, wmd->object_from, DEG_OB_COMP_TRANSFORM, "Warp Modifier from"); DEG_add_object_relation(ctx->node, wmd->object_from, DEG_OB_COMP_TRANSFORM, "Warp Modifier from");
DEG_add_object_relation(node, wmd->object_to, DEG_OB_COMP_TRANSFORM, "Warp Modifier to"); DEG_add_object_relation(ctx->node, wmd->object_to, DEG_OB_COMP_TRANSFORM, "Warp Modifier to");
} }
if ((wmd->texmapping == MOD_DISP_MAP_OBJECT) && wmd->map_object != NULL) { if ((wmd->texmapping == MOD_DISP_MAP_OBJECT) && wmd->map_object != NULL) {
DEG_add_object_relation(node, wmd->map_object, DEG_OB_COMP_TRANSFORM, "Warp Modifier map"); DEG_add_object_relation(ctx->node, wmd->map_object, DEG_OB_COMP_TRANSFORM, "Warp Modifier map");
} }
} }

24
source/blender/modifiers/intern/MOD_wave.c
View File

@@ -127,41 +127,33 @@ static void foreachTexLink(ModifierData *md, Object *ob,
walk(userData, ob, md, "texture"); walk(userData, ob, md, "texture");
} }
static void updateDepgraph(ModifierData *md, DagForest *forest, static void updateDepgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
Scene *UNUSED(scene),
Object *UNUSED(ob),
DagNode *obNode)
{ {
WaveModifierData *wmd = (WaveModifierData *) md; WaveModifierData *wmd = (WaveModifierData *) md;
if (wmd->objectcenter) { if (wmd->objectcenter) {
DagNode *curNode = dag_get_node(forest, wmd->objectcenter); DagNode *curNode = dag_get_node(ctx->forest, wmd->objectcenter);
dag_add_relation(forest, curNode, obNode, DAG_RL_OB_DATA, dag_add_relation(ctx->forest, curNode, ctx->obNode, DAG_RL_OB_DATA,
"Wave Modifier"); "Wave Modifier");
} }
if (wmd->map_object) { if (wmd->map_object) {
DagNode *curNode = dag_get_node(forest, wmd->map_object); DagNode *curNode = dag_get_node(ctx->forest, wmd->map_object);
dag_add_relation(forest, curNode, obNode, DAG_RL_OB_DATA, dag_add_relation(ctx->forest, curNode, ctx->obNode, DAG_RL_OB_DATA,
"Wave Modifer"); "Wave Modifer");
} }
} }
static void updateDepsgraph(ModifierData *md, static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *UNUSED(scene),
Object *UNUSED(ob),
struct DepsNodeHandle *node)
{ {
WaveModifierData *wmd = (WaveModifierData *)md; WaveModifierData *wmd = (WaveModifierData *)md;
if (wmd->objectcenter != NULL) { if (wmd->objectcenter != NULL) {
DEG_add_object_relation(node, wmd->objectcenter, DEG_OB_COMP_TRANSFORM, "Wave Modifier"); DEG_add_object_relation(ctx->node, wmd->objectcenter, DEG_OB_COMP_TRANSFORM, "Wave Modifier");
} }
if (wmd->map_object != NULL) { if (wmd->map_object != NULL) {
DEG_add_object_relation(node, wmd->map_object, DEG_OB_COMP_TRANSFORM, "Wave Modifier"); DEG_add_object_relation(ctx->node, wmd->map_object, DEG_OB_COMP_TRANSFORM, "Wave Modifier");
} }
} }

21
source/blender/modifiers/intern/MOD_weightvgedit.c
View File

@@ -141,38 +141,31 @@ static void foreachTexLink(ModifierData *md, Object *ob, TexWalkFunc walk, void
walk(userData, ob, md, "mask_texture"); walk(userData, ob, md, "mask_texture");
} }
static void updateDepgraph(ModifierData *md, DagForest *forest, static void updateDepgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *UNUSED(scene),
Object *UNUSED(ob), DagNode *obNode)
{ {
WeightVGEditModifierData *wmd = (WeightVGEditModifierData *) md; WeightVGEditModifierData *wmd = (WeightVGEditModifierData *) md;
DagNode *curNode; DagNode *curNode;
if (wmd->mask_tex_map_obj && wmd->mask_tex_mapping == MOD_DISP_MAP_OBJECT) { if (wmd->mask_tex_map_obj && wmd->mask_tex_mapping == MOD_DISP_MAP_OBJECT) {
curNode = dag_get_node(forest, wmd->mask_tex_map_obj); curNode = dag_get_node(ctx->forest, wmd->mask_tex_map_obj);
dag_add_relation(forest, curNode, obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA, dag_add_relation(ctx->forest, curNode, ctx->obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA,
"WeightVGEdit Modifier"); "WeightVGEdit Modifier");
} }
if (wmd->mask_tex_mapping == MOD_DISP_MAP_GLOBAL) if (wmd->mask_tex_mapping == MOD_DISP_MAP_GLOBAL)
dag_add_relation(forest, obNode, obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA, dag_add_relation(ctx->forest, ctx->obNode, ctx->obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA,
"WeightVGEdit Modifier"); "WeightVGEdit Modifier");
} }
static void updateDepsgraph(ModifierData *md, static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *UNUSED(scene),
Object *ob,
struct DepsNodeHandle *node)
{ {
WeightVGEditModifierData *wmd = (WeightVGEditModifierData *)md; WeightVGEditModifierData *wmd = (WeightVGEditModifierData *)md;
if (wmd->mask_tex_map_obj != NULL && wmd->mask_tex_mapping == MOD_DISP_MAP_OBJECT) { if (wmd->mask_tex_map_obj != NULL && wmd->mask_tex_mapping == MOD_DISP_MAP_OBJECT) {
DEG_add_object_relation(node, wmd->mask_tex_map_obj, DEG_OB_COMP_TRANSFORM, "WeightVGEdit Modifier"); DEG_add_object_relation(ctx->node, wmd->mask_tex_map_obj, DEG_OB_COMP_TRANSFORM, "WeightVGEdit Modifier");
} }
if (wmd->mask_tex_mapping == MOD_DISP_MAP_GLOBAL) { if (wmd->mask_tex_mapping == MOD_DISP_MAP_GLOBAL) {
DEG_add_object_relation(node, ob, DEG_OB_COMP_TRANSFORM, "WeightVGEdit Modifier"); DEG_add_object_relation(ctx->node, ctx->object, DEG_OB_COMP_TRANSFORM, "WeightVGEdit Modifier");
} }
} }

25
source/blender/modifiers/intern/MOD_weightvgmix.c
View File

@@ -190,40 +190,33 @@ static void foreachTexLink(ModifierData *md, Object *ob, TexWalkFunc walk, void
walk(userData, ob, md, "mask_texture"); walk(userData, ob, md, "mask_texture");
} }
static void updateDepgraph(ModifierData *md, DagForest *forest, static void updateDepgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *UNUSED(scene),
Object *UNUSED(ob), DagNode *obNode)
{ {
WeightVGMixModifierData *wmd = (WeightVGMixModifierData *) md; WeightVGMixModifierData *wmd = (WeightVGMixModifierData *) md;
DagNode *curNode; DagNode *curNode;
if (wmd->mask_tex_map_obj && wmd->mask_tex_mapping == MOD_DISP_MAP_OBJECT) { if (wmd->mask_tex_map_obj && wmd->mask_tex_mapping == MOD_DISP_MAP_OBJECT) {
curNode = dag_get_node(forest, wmd->mask_tex_map_obj); curNode = dag_get_node(ctx->forest, wmd->mask_tex_map_obj);
dag_add_relation(forest, curNode, obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA, dag_add_relation(ctx->forest, curNode, ctx->obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA,
"WeightVGMix Modifier"); "WeightVGMix Modifier");
} }
if (wmd->mask_tex_mapping == MOD_DISP_MAP_GLOBAL) if (wmd->mask_tex_mapping == MOD_DISP_MAP_GLOBAL)
dag_add_relation(forest, obNode, obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA, dag_add_relation(ctx->forest, ctx->obNode, ctx->obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA,
"WeightVGMix Modifier"); "WeightVGMix Modifier");
} }
static void updateDepsgraph(ModifierData *md, static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *UNUSED(scene),
Object *ob,
struct DepsNodeHandle *node)
{ {
WeightVGMixModifierData *wmd = (WeightVGMixModifierData *) md; WeightVGMixModifierData *wmd = (WeightVGMixModifierData *) md;
if (wmd->mask_tex_map_obj != NULL && wmd->mask_tex_mapping == MOD_DISP_MAP_OBJECT) { if (wmd->mask_tex_map_obj != NULL && wmd->mask_tex_mapping == MOD_DISP_MAP_OBJECT) {
DEG_add_object_relation(node, wmd->mask_tex_map_obj, DEG_OB_COMP_TRANSFORM, "WeightVGMix Modifier"); DEG_add_object_relation(ctx->node, wmd->mask_tex_map_obj, DEG_OB_COMP_TRANSFORM, "WeightVGMix Modifier");
DEG_add_object_relation(node, wmd->mask_tex_map_obj, DEG_OB_COMP_GEOMETRY, "WeightVGMix Modifier"); DEG_add_object_relation(ctx->node, wmd->mask_tex_map_obj, DEG_OB_COMP_GEOMETRY, "WeightVGMix Modifier");
} }
if (wmd->mask_tex_mapping == MOD_DISP_MAP_GLOBAL) { if (wmd->mask_tex_mapping == MOD_DISP_MAP_GLOBAL) {
DEG_add_object_relation(node, ob, DEG_OB_COMP_TRANSFORM, "WeightVGMix Modifier"); DEG_add_object_relation(ctx->node, ctx->object, DEG_OB_COMP_TRANSFORM, "WeightVGMix Modifier");
DEG_add_object_relation(node, ob, DEG_OB_COMP_GEOMETRY, "WeightVGMix Modifier"); DEG_add_object_relation(ctx->node, ctx->object, DEG_OB_COMP_GEOMETRY, "WeightVGMix Modifier");
} }
} }

33
source/blender/modifiers/intern/MOD_weightvgproximity.c
View File

@@ -351,50 +351,43 @@ static void foreachTexLink(ModifierData *md, Object *ob, TexWalkFunc walk, void
walk(userData, ob, md, "mask_texture"); walk(userData, ob, md, "mask_texture");
} }
static void updateDepgraph(ModifierData *md, DagForest *forest, static void updateDepgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *UNUSED(scene),
Object *UNUSED(ob), DagNode *obNode)
{ {
WeightVGProximityModifierData *wmd = (WeightVGProximityModifierData *) md; WeightVGProximityModifierData *wmd = (WeightVGProximityModifierData *) md;
DagNode *curNode; DagNode *curNode;
if (wmd->proximity_ob_target) { if (wmd->proximity_ob_target) {
curNode = dag_get_node(forest, wmd->proximity_ob_target); curNode = dag_get_node(ctx->forest, wmd->proximity_ob_target);
dag_add_relation(forest, curNode, obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA, dag_add_relation(ctx->forest, curNode, ctx->obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA,
"WeightVGProximity Modifier"); "WeightVGProximity Modifier");
} }
if (wmd->mask_tex_map_obj && wmd->mask_tex_mapping == MOD_DISP_MAP_OBJECT) { if (wmd->mask_tex_map_obj && wmd->mask_tex_mapping == MOD_DISP_MAP_OBJECT) {
curNode = dag_get_node(forest, wmd->mask_tex_map_obj); curNode = dag_get_node(ctx->forest, wmd->mask_tex_map_obj);
dag_add_relation(forest, curNode, obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA, dag_add_relation(ctx->forest, curNode, ctx->obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA,
"WeightVGProximity Modifier"); "WeightVGProximity Modifier");
} }
if (wmd->mask_tex_mapping == MOD_DISP_MAP_GLOBAL) if (wmd->mask_tex_mapping == MOD_DISP_MAP_GLOBAL)
dag_add_relation(forest, obNode, obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA, dag_add_relation(ctx->forest, ctx->obNode, ctx->obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA,
"WeightVGProximity Modifier"); "WeightVGProximity Modifier");
} }
static void updateDepsgraph(ModifierData *md, static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
struct Main *UNUSED(bmain),
struct Scene *UNUSED(scene),
Object *ob,
struct DepsNodeHandle *node)
{ {
WeightVGProximityModifierData *wmd = (WeightVGProximityModifierData *)md; WeightVGProximityModifierData *wmd = (WeightVGProximityModifierData *)md;
if (wmd->proximity_ob_target != NULL) { if (wmd->proximity_ob_target != NULL) {
DEG_add_object_relation(node, wmd->proximity_ob_target, DEG_OB_COMP_TRANSFORM, "WeightVGProximity Modifier"); DEG_add_object_relation(ctx->node, wmd->proximity_ob_target, DEG_OB_COMP_TRANSFORM, "WeightVGProximity Modifier");
DEG_add_object_relation(node, wmd->proximity_ob_target, DEG_OB_COMP_GEOMETRY, "WeightVGProximity Modifier"); DEG_add_object_relation(ctx->node, wmd->proximity_ob_target, DEG_OB_COMP_GEOMETRY, "WeightVGProximity Modifier");
} }
if (wmd->mask_tex_map_obj != NULL && wmd->mask_tex_mapping == MOD_DISP_MAP_OBJECT) { if (wmd->mask_tex_map_obj != NULL && wmd->mask_tex_mapping == MOD_DISP_MAP_OBJECT) {
DEG_add_object_relation(node, wmd->mask_tex_map_obj, DEG_OB_COMP_TRANSFORM, "WeightVGProximity Modifier"); DEG_add_object_relation(ctx->node, wmd->mask_tex_map_obj, DEG_OB_COMP_TRANSFORM, "WeightVGProximity Modifier");
DEG_add_object_relation(node, wmd->mask_tex_map_obj, DEG_OB_COMP_GEOMETRY, "WeightVGProximity Modifier"); DEG_add_object_relation(ctx->node, wmd->mask_tex_map_obj, DEG_OB_COMP_GEOMETRY, "WeightVGProximity Modifier");
} }
if (wmd->mask_tex_mapping == MOD_DISP_MAP_GLOBAL) { if (wmd->mask_tex_mapping == MOD_DISP_MAP_GLOBAL) {
DEG_add_object_relation(node, ob, DEG_OB_COMP_TRANSFORM, "WeightVGProximity Modifier"); DEG_add_object_relation(ctx->node, ctx->object, DEG_OB_COMP_TRANSFORM, "WeightVGProximity Modifier");
DEG_add_object_relation(node, ob, DEG_OB_COMP_GEOMETRY, "WeightVGProximity Modifier"); DEG_add_object_relation(ctx->node, ctx->object, DEG_OB_COMP_GEOMETRY, "WeightVGProximity Modifier");
} }
} }