Depsgraph: More clear function name for transform dependnecy
The name was confusing to a level that it sounded like the relation goes the opposite direction than it is intended.
This commit is contained in:
parent
0828361889
commit
39a68b27b9
|
@ -161,7 +161,7 @@ void DEG_add_generic_id_relation(struct DepsNodeHandle *node_handle,
|
|||
* This function will take care of checking which operation is required to
|
||||
* have transformation for the modifier, taking into account possible simulation solvers.
|
||||
*/
|
||||
void DEG_add_modifier_to_transform_relation(struct DepsNodeHandle *node_handle,
|
||||
void DEG_add_depends_on_transform_relation(struct DepsNodeHandle *node_handle,
|
||||
const char *description);
|
||||
|
||||
/**
|
||||
|
|
|
@ -298,8 +298,8 @@ bool DepsgraphRelationBuilder::has_node(const OperationKey &key) const
|
|||
return find_node(key) != nullptr;
|
||||
}
|
||||
|
||||
void DepsgraphRelationBuilder::add_modifier_to_transform_relation(const DepsNodeHandle *handle,
|
||||
const char *description)
|
||||
void DepsgraphRelationBuilder::add_depends_on_transform_relation(const DepsNodeHandle *handle,
|
||||
const char *description)
|
||||
{
|
||||
IDNode *id_node = handle->node->owner->owner;
|
||||
ID *id = id_node->id_orig;
|
||||
|
|
|
@ -177,7 +177,7 @@ class DepsgraphRelationBuilder : public DepsgraphBuilder {
|
|||
/* Adds relation from proper transformation operation to the modifier.
|
||||
* Takes care of checking for possible physics solvers modifying position
|
||||
* of this object. */
|
||||
void add_modifier_to_transform_relation(const DepsNodeHandle *handle, const char *description);
|
||||
void add_depends_on_transform_relation(const DepsNodeHandle *handle, const char *description);
|
||||
|
||||
void add_customdata_mask(Object *object, const DEGCustomDataMeshMasks &customdata_masks);
|
||||
void add_special_eval_flag(ID *id, uint32_t flag);
|
||||
|
|
|
@ -199,11 +199,11 @@ void DEG_add_generic_id_relation(struct DepsNodeHandle *node_handle,
|
|||
deg_node_handle->builder->add_node_handle_relation(operation_key, deg_node_handle, description);
|
||||
}
|
||||
|
||||
void DEG_add_modifier_to_transform_relation(struct DepsNodeHandle *node_handle,
|
||||
const char *description)
|
||||
void DEG_add_depends_on_transform_relation(struct DepsNodeHandle *node_handle,
|
||||
const char *description)
|
||||
{
|
||||
deg::DepsNodeHandle *deg_node_handle = get_node_handle(node_handle);
|
||||
deg_node_handle->builder->add_modifier_to_transform_relation(deg_node_handle, description);
|
||||
deg_node_handle->builder->add_depends_on_transform_relation(deg_node_handle, description);
|
||||
}
|
||||
|
||||
void DEG_add_special_eval_flag(struct DepsNodeHandle *node_handle, ID *id, uint32_t flag)
|
||||
|
|
|
@ -225,7 +225,7 @@ static void updateDepsgraph(GpencilModifierData *md,
|
|||
ctx->node, &mmd->aux_target->id, DAG_EVAL_NEED_SHRINKWRAP_BOUNDARY);
|
||||
}
|
||||
}
|
||||
DEG_add_modifier_to_transform_relation(ctx->node, "Shrinkwrap Modifier");
|
||||
DEG_add_depends_on_transform_relation(ctx->node, "Shrinkwrap Modifier");
|
||||
}
|
||||
|
||||
static void foreachIDLink(GpencilModifierData *md, Object *ob, IDWalkFunc walk, void *userData)
|
||||
|
|
|
@ -125,7 +125,7 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte
|
|||
|
||||
DEG_add_object_relation(ctx->node, amd->object, DEG_OB_COMP_TRANSFORM, "Armature Modifier");
|
||||
}
|
||||
DEG_add_modifier_to_transform_relation(ctx->node, "Armature Modifier");
|
||||
DEG_add_depends_on_transform_relation(ctx->node, "Armature Modifier");
|
||||
}
|
||||
|
||||
static void deformVerts(ModifierData *md,
|
||||
|
|
|
@ -93,7 +93,7 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte
|
|||
}
|
||||
|
||||
if (need_transform_dependency) {
|
||||
DEG_add_modifier_to_transform_relation(ctx->node, "Array Modifier");
|
||||
DEG_add_depends_on_transform_relation(ctx->node, "Array Modifier");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -117,7 +117,7 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte
|
|||
DEG_add_collection_geometry_relation(ctx->node, col, "Boolean Modifier");
|
||||
}
|
||||
/* We need own transformation as well. */
|
||||
DEG_add_modifier_to_transform_relation(ctx->node, "Boolean Modifier");
|
||||
DEG_add_depends_on_transform_relation(ctx->node, "Boolean Modifier");
|
||||
}
|
||||
|
||||
static Mesh *get_quick_mesh(
|
||||
|
|
|
@ -87,7 +87,7 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte
|
|||
CastModifierData *cmd = (CastModifierData *)md;
|
||||
if (cmd->object != NULL) {
|
||||
DEG_add_object_relation(ctx->node, cmd->object, DEG_OB_COMP_TRANSFORM, "Cast Modifier");
|
||||
DEG_add_modifier_to_transform_relation(ctx->node, "Cast Modifier");
|
||||
DEG_add_depends_on_transform_relation(ctx->node, "Cast Modifier");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -144,7 +144,7 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte
|
|||
DEG_add_forcefield_relations(
|
||||
ctx->node, ctx->object, clmd->sim_parms->effector_weights, true, 0, "Cloth Field");
|
||||
}
|
||||
DEG_add_modifier_to_transform_relation(ctx->node, "Cloth Modifier");
|
||||
DEG_add_depends_on_transform_relation(ctx->node, "Cloth Modifier");
|
||||
}
|
||||
|
||||
static void requiredDataMask(Object *UNUSED(ob),
|
||||
|
|
|
@ -236,7 +236,7 @@ static void deformVerts(ModifierData *md,
|
|||
|
||||
static void updateDepsgraph(ModifierData *UNUSED(md), const ModifierUpdateDepsgraphContext *ctx)
|
||||
{
|
||||
DEG_add_modifier_to_transform_relation(ctx->node, "Collision Modifier");
|
||||
DEG_add_depends_on_transform_relation(ctx->node, "Collision Modifier");
|
||||
}
|
||||
|
||||
static void panel_draw(const bContext *UNUSED(C), Panel *panel)
|
||||
|
|
|
@ -97,7 +97,7 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte
|
|||
DEG_add_special_eval_flag(ctx->node, &cmd->object->id, DAG_EVAL_NEED_CURVE_PATH);
|
||||
}
|
||||
|
||||
DEG_add_modifier_to_transform_relation(ctx->node, "Curve Modifier");
|
||||
DEG_add_depends_on_transform_relation(ctx->node, "Curve Modifier");
|
||||
}
|
||||
|
||||
static void deformVerts(ModifierData *md,
|
||||
|
|
|
@ -129,7 +129,7 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte
|
|||
if (dtmd->flags & MOD_DATATRANSFER_OBSRC_TRANSFORM) {
|
||||
DEG_add_object_relation(
|
||||
ctx->node, dtmd->ob_source, DEG_OB_COMP_TRANSFORM, "DataTransfer Modifier");
|
||||
DEG_add_modifier_to_transform_relation(ctx->node, "DataTransfer Modifier");
|
||||
DEG_add_depends_on_transform_relation(ctx->node, "DataTransfer Modifier");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -142,7 +142,7 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte
|
|||
}
|
||||
|
||||
if (need_transform_relation) {
|
||||
DEG_add_modifier_to_transform_relation(ctx->node, "Displace Modifier");
|
||||
DEG_add_depends_on_transform_relation(ctx->node, "Displace Modifier");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -122,7 +122,7 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte
|
|||
DEG_add_object_relation(ctx->node, hmd->object, DEG_OB_COMP_TRANSFORM, "Hook Modifier");
|
||||
}
|
||||
/* We need own transformation as well. */
|
||||
DEG_add_modifier_to_transform_relation(ctx->node, "Hook Modifier");
|
||||
DEG_add_depends_on_transform_relation(ctx->node, "Hook Modifier");
|
||||
}
|
||||
|
||||
struct HookData_cb {
|
||||
|
|
|
@ -87,7 +87,7 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte
|
|||
DEG_add_object_relation(ctx->node, lmd->object, DEG_OB_COMP_GEOMETRY, "Lattice Modifier");
|
||||
DEG_add_object_relation(ctx->node, lmd->object, DEG_OB_COMP_TRANSFORM, "Lattice Modifier");
|
||||
}
|
||||
DEG_add_modifier_to_transform_relation(ctx->node, "Lattice Modifier");
|
||||
DEG_add_depends_on_transform_relation(ctx->node, "Lattice Modifier");
|
||||
}
|
||||
|
||||
static void deformVerts(ModifierData *md,
|
||||
|
|
|
@ -86,7 +86,7 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte
|
|||
/* TODO(sergey): Is it a proper relation here? */
|
||||
DEG_add_object_relation(ctx->node, mmd->ob_arm, DEG_OB_COMP_TRANSFORM, "Mask Modifier");
|
||||
arm->flag |= ARM_HAS_VIZ_DEPS;
|
||||
DEG_add_modifier_to_transform_relation(ctx->node, "Mask Modifier");
|
||||
DEG_add_depends_on_transform_relation(ctx->node, "Mask Modifier");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -60,7 +60,7 @@ static void initData(ModifierData *md)
|
|||
static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
|
||||
{
|
||||
MeshToVolumeModifierData *mvmd = reinterpret_cast<MeshToVolumeModifierData *>(md);
|
||||
DEG_add_modifier_to_transform_relation(ctx->node, "Mesh to Volume Modifier");
|
||||
DEG_add_depends_on_transform_relation(ctx->node, "Mesh to Volume Modifier");
|
||||
if (mvmd->object) {
|
||||
DEG_add_object_relation(
|
||||
ctx->node, mvmd->object, DEG_OB_COMP_GEOMETRY, "Mesh to Volume Modifier");
|
||||
|
|
|
@ -160,7 +160,7 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte
|
|||
DEG_add_object_relation(ctx->node, mmd->object, DEG_OB_COMP_GEOMETRY, "Mesh Deform Modifier");
|
||||
}
|
||||
/* We need own transformation as well. */
|
||||
DEG_add_modifier_to_transform_relation(ctx->node, "Mesh Deform Modifier");
|
||||
DEG_add_depends_on_transform_relation(ctx->node, "Mesh Deform Modifier");
|
||||
}
|
||||
|
||||
static float meshdeform_dynamic_bind(MeshDeformModifierData *mmd, float (*dco)[3], float vec[3])
|
||||
|
|
|
@ -62,7 +62,7 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte
|
|||
MirrorModifierData *mmd = (MirrorModifierData *)md;
|
||||
if (mmd->mirror_ob != NULL) {
|
||||
DEG_add_object_relation(ctx->node, mmd->mirror_ob, DEG_OB_COMP_TRANSFORM, "Mirror Modifier");
|
||||
DEG_add_modifier_to_transform_relation(ctx->node, "Mirror Modifier");
|
||||
DEG_add_depends_on_transform_relation(ctx->node, "Mirror Modifier");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -307,7 +307,7 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte
|
|||
}
|
||||
|
||||
if (needs_own_transform_relation) {
|
||||
DEG_add_modifier_to_transform_relation(ctx->node, "Nodes Modifier");
|
||||
DEG_add_depends_on_transform_relation(ctx->node, "Nodes Modifier");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -670,7 +670,7 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte
|
|||
NormalEditModifierData *enmd = (NormalEditModifierData *)md;
|
||||
if (enmd->target) {
|
||||
DEG_add_object_relation(ctx->node, enmd->target, DEG_OB_COMP_TRANSFORM, "NormalEdit Modifier");
|
||||
DEG_add_modifier_to_transform_relation(ctx->node, "NormalEdit Modifier");
|
||||
DEG_add_depends_on_transform_relation(ctx->node, "NormalEdit Modifier");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1148,7 +1148,7 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte
|
|||
ScrewModifierData *ltmd = (ScrewModifierData *)md;
|
||||
if (ltmd->ob_axis != NULL) {
|
||||
DEG_add_object_relation(ctx->node, ltmd->ob_axis, DEG_OB_COMP_TRANSFORM, "Screw Modifier");
|
||||
DEG_add_modifier_to_transform_relation(ctx->node, "Screw Modifier");
|
||||
DEG_add_depends_on_transform_relation(ctx->node, "Screw Modifier");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -186,7 +186,7 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte
|
|||
DEG_add_special_eval_flag(ctx->node, &smd->auxTarget->id, DAG_EVAL_NEED_SHRINKWRAP_BOUNDARY);
|
||||
}
|
||||
}
|
||||
DEG_add_modifier_to_transform_relation(ctx->node, "Shrinkwrap Modifier");
|
||||
DEG_add_depends_on_transform_relation(ctx->node, "Shrinkwrap Modifier");
|
||||
}
|
||||
|
||||
static bool dependsOnNormals(ModifierData *md)
|
||||
|
|
|
@ -438,7 +438,7 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte
|
|||
if (smd->origin != NULL) {
|
||||
DEG_add_object_relation(
|
||||
ctx->node, smd->origin, DEG_OB_COMP_TRANSFORM, "SimpleDeform Modifier");
|
||||
DEG_add_modifier_to_transform_relation(ctx->node, "SimpleDeform Modifier");
|
||||
DEG_add_depends_on_transform_relation(ctx->node, "SimpleDeform Modifier");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -66,7 +66,7 @@ static void updateDepsgraph(ModifierData *UNUSED(md), const ModifierUpdateDepsgr
|
|||
ctx->node, ctx->object, ctx->object->soft->effector_weights, true, 0, "Softbody Field");
|
||||
}
|
||||
/* We need own transformation as well. */
|
||||
DEG_add_modifier_to_transform_relation(ctx->node, "SoftBody Modifier");
|
||||
DEG_add_depends_on_transform_relation(ctx->node, "SoftBody Modifier");
|
||||
}
|
||||
|
||||
static void panel_draw(const bContext *UNUSED(C), Panel *panel)
|
||||
|
|
|
@ -80,7 +80,7 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte
|
|||
}
|
||||
}
|
||||
if (do_add_own_transform) {
|
||||
DEG_add_modifier_to_transform_relation(ctx->node, "UV Project Modifier");
|
||||
DEG_add_depends_on_transform_relation(ctx->node, "UV Project Modifier");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -242,7 +242,7 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte
|
|||
MOD_depsgraph_update_object_bone_relation(
|
||||
ctx->node, umd->object_dst, umd->bone_dst, "UVWarp Modifier");
|
||||
|
||||
DEG_add_modifier_to_transform_relation(ctx->node, "UVWarp Modifier");
|
||||
DEG_add_depends_on_transform_relation(ctx->node, "UVWarp Modifier");
|
||||
}
|
||||
|
||||
static void panel_draw(const bContext *UNUSED(C), Panel *panel)
|
||||
|
|
|
@ -62,7 +62,7 @@ static void initData(ModifierData *md)
|
|||
static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
|
||||
{
|
||||
VolumeToMeshModifierData *vmmd = reinterpret_cast<VolumeToMeshModifierData *>(md);
|
||||
DEG_add_modifier_to_transform_relation(ctx->node, "Volume to Mesh Modifier");
|
||||
DEG_add_depends_on_transform_relation(ctx->node, "Volume to Mesh Modifier");
|
||||
if (vmmd->object) {
|
||||
DEG_add_object_relation(
|
||||
ctx->node, vmmd->object, DEG_OB_COMP_GEOMETRY, "Volume to Mesh Modifier");
|
||||
|
|
|
@ -171,7 +171,7 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte
|
|||
}
|
||||
|
||||
if (need_transform_relation) {
|
||||
DEG_add_modifier_to_transform_relation(ctx->node, "Warp Modifier");
|
||||
DEG_add_depends_on_transform_relation(ctx->node, "Warp Modifier");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -98,7 +98,7 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte
|
|||
}
|
||||
|
||||
if (need_transform_relation) {
|
||||
DEG_add_modifier_to_transform_relation(ctx->node, "Wave Modifier");
|
||||
DEG_add_depends_on_transform_relation(ctx->node, "Wave Modifier");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -139,7 +139,7 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte
|
|||
}
|
||||
|
||||
if (need_transform_relation) {
|
||||
DEG_add_modifier_to_transform_relation(ctx->node, "WeightVGEdit Modifier");
|
||||
DEG_add_depends_on_transform_relation(ctx->node, "WeightVGEdit Modifier");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -187,7 +187,7 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte
|
|||
}
|
||||
|
||||
if (need_transform_relation) {
|
||||
DEG_add_modifier_to_transform_relation(ctx->node, "WeightVGMix Modifier");
|
||||
DEG_add_depends_on_transform_relation(ctx->node, "WeightVGMix Modifier");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -401,7 +401,7 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte
|
|||
}
|
||||
|
||||
if (need_transform_relation) {
|
||||
DEG_add_modifier_to_transform_relation(ctx->node, "WeightVGProximity Modifier");
|
||||
DEG_add_depends_on_transform_relation(ctx->node, "WeightVGProximity Modifier");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue