diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-04-13 08:54:37 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-04-13 08:54:37 +0300 |
| commit | f684dfc43216a3e9286202bd07b05064bb37f9ee (patch) | |
| tree | 4c895c1eadeb90046520e790ab3958920c06a381 | |
| parent | dd0cba00764eca60e29254c6836e980af57772ce (diff) | |
Fix T44364: Remove shape key crashes Blender
| -rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 3 | ||||
| -rw-r--r-- | source/blender/modifiers/intern/MOD_cloth.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index 87a00c20d46..1ece9d82cc2 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -1011,8 +1011,9 @@ static float (*get_orco_coords_dm(Object *ob, BMEditMesh *em, int layer, int *fr ClothModifierData *clmd = (ClothModifierData *)modifiers_findByType(ob, eModifierType_Cloth); KeyBlock *kb = BKE_keyblock_from_key(BKE_key_from_object(ob), clmd->sim_parms->shapekey_rest); - if (kb->data) + if (kb && kb->data) { return kb->data; + } } return NULL; diff --git a/source/blender/modifiers/intern/MOD_cloth.c b/source/blender/modifiers/intern/MOD_cloth.c index d76427cd6ee..392112e4b4a 100644 --- a/source/blender/modifiers/intern/MOD_cloth.c +++ b/source/blender/modifiers/intern/MOD_cloth.c @@ -98,7 +98,7 @@ static void deformVerts(ModifierData *md, Object *ob, DerivedMesh *derivedData, if (derivedData == NULL && clmd->sim_parms->shapekey_rest) { KeyBlock *kb = BKE_keyblock_from_key(BKE_key_from_object(ob), clmd->sim_parms->shapekey_rest); - if (kb->data != NULL) { + if (kb && kb->data != NULL) { float (*layerorco)[3]; if (!(layerorco = DM_get_vert_data_layer(dm, CD_CLOTH_ORCO))) { DM_add_vert_layer(dm, CD_CLOTH_ORCO, CD_CALLOC, NULL); |