diff options
author | Lukas Tönne <lukas.toenne@gmail.com> | 2014-03-05 18:11:36 +0400 |
---|---|---|
committer | Lukas Tönne <lukas.toenne@gmail.com> | 2014-03-05 18:13:50 +0400 |
commit | 3aedb3aed7c8c2a268db2fab6e69007fa65f4950 (patch) | |
tree | e9ea37cc684f5c75ab3aeb99e8643dcf77a896a2 /source | |
parent | df3116b3269f428ffbbcc31a1f786da0d6510400 (diff) |
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.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/armature.c | 2 | ||||
-rw-r--r-- | 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; |