diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-03-26 13:25:07 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-04-01 15:43:45 +0300 |
| commit | 64c8d72ef1ad01dae0ef0a7a78a47d7c83a240d4 (patch) | |
| tree | ec85173659b0637ea9dfec8c8e900b46bbe9c808 /source/blender/modifiers/intern/MOD_cast.c | |
| parent | a2a571987c6f6a1caee57057cfed18896b786c5b (diff) | |
Modifiers: Use object passed to evaluation
This was wrong and violating design to force modifiers to query
evaluated objects and IDs. It is up to the caller to make sure
the object is properly evaluatable.
Effectively, reverting changes from de491abf9962 (and possibly
other related changes).
Diffstat (limited to 'source/blender/modifiers/intern/MOD_cast.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_cast.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/modifiers/intern/MOD_cast.c b/source/blender/modifiers/intern/MOD_cast.c index ec0aa4361f4..b8917f58234 100644 --- a/source/blender/modifiers/intern/MOD_cast.c +++ b/source/blender/modifiers/intern/MOD_cast.c @@ -95,7 +95,7 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte } static void sphere_do( - CastModifierData *cmd, const ModifierEvalContext *ctx, + CastModifierData *cmd, const ModifierEvalContext *UNUSED(ctx), Object *ob, Mesh *mesh, float (*vertexCos)[3], int numVerts) { @@ -119,7 +119,7 @@ static void sphere_do( if (type == MOD_CAST_TYPE_CYLINDER) flag &= ~MOD_CAST_Z; - ctrl_ob = DEG_get_evaluated_object(ctx->depsgraph, cmd->object); + ctrl_ob = cmd->object; /* spherify's center is {0, 0, 0} (the ob's own center in its local * space), by default, but if the user defined a control object, @@ -217,7 +217,7 @@ static void sphere_do( } static void cuboid_do( - CastModifierData *cmd, const ModifierEvalContext *ctx, + CastModifierData *cmd, const ModifierEvalContext *UNUSED(ctx), Object *ob, Mesh *mesh, float (*vertexCos)[3], int numVerts) { @@ -236,7 +236,7 @@ static void cuboid_do( flag = cmd->flag; - ctrl_ob = DEG_get_evaluated_object(ctx->depsgraph, cmd->object); + ctrl_ob = cmd->object; /* now we check which options the user wants */ |