Revision: 45383
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45383
Author: campbellbarton
Date: 2012-04-04 00:02:48 +0000 (Wed, 04 Apr 2012)
Log Message:
-----------
fix for reconstructing shape keys (found when looking into bug [#30797], but
not a fix for this bug).
Modified Paths:
--------------
trunk/blender/source/blender/bmesh/intern/bmesh_mesh_conv.c
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_mesh_conv.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_mesh_conv.c 2012-04-03
23:40:24 UTC (rev 45382)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_mesh_conv.c 2012-04-04
00:02:48 UTC (rev 45383)
@@ -849,10 +849,8 @@
mvert = me->mvert;
while (eve) {
keyi = CustomData_bmesh_get(&bm->vdata,
eve->head.data, CD_SHAPE_KEYINDEX);
- if (!keyi) {
- break;
- }
- if (*keyi >= 0 && *keyi < currkey->totelem) {
// valid old vertex
+
+ if (keyi && *keyi != ORIGINDEX_NONE && *keyi <
currkey->totelem) { /* valid old vertex */
if (currkey == actkey) {
if (actkey == me->key->refkey) {
copy_v3_v3(fp,
mvert->co);
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
