diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-12-17 06:00:19 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-12-17 06:00:19 +0300 |
| commit | ca277d7d6073b0ead3c38c028ab74b05d5728fea (patch) | |
| tree | d4b18fef25b64787e5cc41717872e09969d0eed0 /source/blender/modifiers/intern/MOD_fluid.c | |
| parent | 79e51d9e5fba95fc9569e75412b27b08bef7a7d5 (diff) | |
Cleanup: renaming guiding -> guide
The term guide makes sense on it's own in this context.
Diffstat (limited to 'source/blender/modifiers/intern/MOD_fluid.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_fluid.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/modifiers/intern/MOD_fluid.c b/source/blender/modifiers/intern/MOD_fluid.c index a24c2299cd8..b48c80d8e32 100644 --- a/source/blender/modifiers/intern/MOD_fluid.c +++ b/source/blender/modifiers/intern/MOD_fluid.c @@ -163,11 +163,11 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte PFIELD_SMOKEFLOW, "Fluid Force Field"); - if (mmd->domain->guiding_parent != NULL) { + if (mmd->domain->guide_parent != NULL) { DEG_add_object_relation( - ctx->node, mmd->domain->guiding_parent, DEG_OB_COMP_TRANSFORM, "Fluid Guiding Object"); + ctx->node, mmd->domain->guide_parent, DEG_OB_COMP_TRANSFORM, "Fluid Guiding Object"); DEG_add_object_relation( - ctx->node, mmd->domain->guiding_parent, DEG_OB_COMP_GEOMETRY, "Fluid Guiding Object"); + ctx->node, mmd->domain->guide_parent, DEG_OB_COMP_GEOMETRY, "Fluid Guiding Object"); } } } @@ -181,8 +181,8 @@ static void foreachIDLink(ModifierData *md, Object *ob, IDWalkFunc walk, void *u walk(userData, ob, (ID **)&mmd->domain->fluid_group, IDWALK_CB_NOP); walk(userData, ob, (ID **)&mmd->domain->force_group, IDWALK_CB_NOP); - if (mmd->domain->guiding_parent) { - walk(userData, ob, (ID **)&mmd->domain->guiding_parent, IDWALK_CB_NOP); + if (mmd->domain->guide_parent) { + walk(userData, ob, (ID **)&mmd->domain->guide_parent, IDWALK_CB_NOP); } if (mmd->domain->effector_weights) { |