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

Fix T60067: some modifiers don't use shape keys correctly

Browse Source
This commit is contained in:
Jacques Lucke
2019-01-29 17:57:21 +01:00
parent 33dcf9fa71
commit 2ff6b2925a
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/modifiers/intern/MOD_bevel.c
View File

@@ -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,
});

4
source/blender/modifiers/intern/MOD_edgesplit.c
View File

@@ -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,
});

4
source/blender/modifiers/intern/MOD_wireframe.c
View File

@@ -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,
});