forked from bartvdbraak/blender
Fix T44364: Remove shape key crashes Blender
This commit is contained in:
parent
dd0cba0076
commit
f684dfc432
@ -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;
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user