diff options
author | Jacques Lucke <mail@jlucke.com> | 2019-01-29 19:57:21 +0300 |
---|---|---|
committer | Jacques Lucke <mail@jlucke.com> | 2019-01-29 19:57:21 +0300 |
commit | 2ff6b2925a1273d02a805057cfbed79d29bad5e3 (patch) | |
tree | b1de7539e32c858c0f9659b05f7f8bfb3d4ce7c4 | |
parent | 33dcf9fa71c737df303f2738fb66c06bada8c0ff (diff) |
Fix T60067: some modifiers don't use shape keys correctly
-rw-r--r-- | source/blender/modifiers/intern/MOD_bevel.c | 4 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_edgesplit.c | 4 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_wireframe.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/modifiers/intern/MOD_bevel.c b/source/blender/modifiers/intern/MOD_bevel.c index 89608f33344..072af028307 100644 --- a/source/blender/modifiers/intern/MOD_bevel.c +++ b/source/blender/modifiers/intern/MOD_bevel.c @@ -130,8 +130,8 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mes &(struct BMeshFromMeshParams){ .calc_face_normal = true, .add_key_index = false, - .use_shapekey = true, - .active_shapekey = ctx->object->shapenr, + .use_shapekey = false, + .active_shapekey = 0, .cd_mask_extra = CD_MASK_ORIGINDEX, }); diff --git a/source/blender/modifiers/intern/MOD_edgesplit.c b/source/blender/modifiers/intern/MOD_edgesplit.c index 465e07c7bd4..0140306bc9a 100644 --- a/source/blender/modifiers/intern/MOD_edgesplit.c +++ b/source/blender/modifiers/intern/MOD_edgesplit.c @@ -68,8 +68,8 @@ static Mesh *doEdgeSplit(Mesh *mesh, EdgeSplitModifierData *emd, const ModifierE &(struct BMeshFromMeshParams){ .calc_face_normal = calc_face_normals, .add_key_index = false, - .use_shapekey = true, - .active_shapekey = ctx->object->shapenr, + .use_shapekey = false, + .active_shapekey = 0, .cd_mask_extra = CD_MASK_ORIGINDEX, }); diff --git a/source/blender/modifiers/intern/MOD_wireframe.c b/source/blender/modifiers/intern/MOD_wireframe.c index a47be7b5244..bb2a7753c0e 100644 --- a/source/blender/modifiers/intern/MOD_wireframe.c +++ b/source/blender/modifiers/intern/MOD_wireframe.c @@ -74,8 +74,8 @@ static Mesh *WireframeModifier_do(WireframeModifierData *wmd, Object *ob, Mesh * &(struct BMeshFromMeshParams){ .calc_face_normal = true, .add_key_index = false, - .use_shapekey = true, - .active_shapekey = ob->shapenr, + .use_shapekey = false, + .active_shapekey = 0, .cd_mask_extra = CD_MASK_ORIGINDEX, }); |