diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-12-10 09:38:00 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-10 09:38:00 +0400 |
| commit | 65f3b93f144699fa4aafa46c7e226aa1390b7239 (patch) | |
| tree | 1a9599589c98d9e17631844fd011463031fe59cd /source/gameengine/Converter/BL_SkinDeformer.cpp | |
| parent | 99d893bb89a96dd0d6cb9410b12928e7ade4b565 (diff) | |
| parent | a88b29c062f32514e4414bfd4006f7b348077a42 (diff) | |
svn merge ^/trunk/blender -r42521:42550
Diffstat (limited to 'source/gameengine/Converter/BL_SkinDeformer.cpp')
| -rw-r--r-- | source/gameengine/Converter/BL_SkinDeformer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/gameengine/Converter/BL_SkinDeformer.cpp b/source/gameengine/Converter/BL_SkinDeformer.cpp index 81533205909..0c4806f4bd8 100644 --- a/source/gameengine/Converter/BL_SkinDeformer.cpp +++ b/source/gameengine/Converter/BL_SkinDeformer.cpp @@ -217,14 +217,14 @@ void BL_SkinDeformer::BGEDeformVerts() Object *par_arma = m_armobj->GetArmatureObject(); MDeformVert *dverts = m_bmesh->dvert; bDeformGroup *dg; - int numGroups = BLI_countlist(&m_objMesh->defbase); + int defbase_tot = BLI_countlist(&m_objMesh->defbase); if (!dverts) return; if (m_dfnrToPC == NULL) { - m_dfnrToPC = new bPoseChannel*[numGroups]; + m_dfnrToPC = new bPoseChannel*[defbase_tot]; int i; for (i=0, dg=(bDeformGroup*)m_objMesh->defbase.first; dg; @@ -260,7 +260,7 @@ void BL_SkinDeformer::BGEDeformVerts() { int index = dvert->dw[j].def_nr; - if (index < numGroups && (pchan=m_dfnrToPC[index])) + if (index < defbase_tot && (pchan=m_dfnrToPC[index])) { weight = dvert->dw[j].weight; |