From 3aedb3aed7c8c2a268db2fab6e69007fa65f4950 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20T=C3=B6nne?= Date: Wed, 5 Mar 2014 15:11:36 +0100 Subject: Fix for invalid custom data checks in armature and lattice functions. Testing for custom data availability with getVertData and index 0 fails on assert for empty meshes (the index must be in valid range). Better use getVertDataArray which has no requirement for specific index. --- source/blender/blenkernel/intern/armature.c | 2 +- source/blender/blenkernel/intern/lattice.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c index 29d322e330e..11a34ce9d38 100644 --- a/source/blender/blenkernel/intern/armature.c +++ b/source/blender/blenkernel/intern/armature.c @@ -888,7 +888,7 @@ void armature_deform_verts(Object *armOb, Object *target, DerivedMesh *dm, float if (ELEM(target->type, OB_MESH, OB_LATTICE)) { /* if we have a DerivedMesh, only use dverts if it has them */ if (dm) { - use_dverts = (dm->getVertData(dm, 0, CD_MDEFORMVERT) != NULL); + use_dverts = (dm->getVertDataArray(dm, CD_MDEFORMVERT) != NULL); } else if (dverts) { use_dverts = TRUE; diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c index 8330fefa0ae..72462eed30c 100644 --- a/source/blender/blenkernel/intern/lattice.c +++ b/source/blender/blenkernel/intern/lattice.c @@ -894,7 +894,7 @@ void lattice_deform_verts(Object *laOb, Object *target, DerivedMesh *dm, if (target && target->type == OB_MESH) { /* if there's derived data without deformverts, don't use vgroups */ if (dm) { - use_vgroups = (dm->getVertData(dm, 0, CD_MDEFORMVERT) != NULL); + use_vgroups = (dm->getVertDataArray(dm, CD_MDEFORMVERT) != NULL); } else { Mesh *me = target->data; -- cgit v1.2.3