Revision: 36913 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36913 Author: blendix Date: 2011-05-26 10:21:09 +0000 (Thu, 26 May 2011) Log Message: ----------- Fix #27480: armature multimodifier was not working in edit mode.
Modified Paths: -------------- trunk/blender/source/blender/modifiers/intern/MOD_armature.c Modified: trunk/blender/source/blender/modifiers/intern/MOD_armature.c =================================================================== --- trunk/blender/source/blender/modifiers/intern/MOD_armature.c 2011-05-26 09:58:22 UTC (rev 36912) +++ trunk/blender/source/blender/modifiers/intern/MOD_armature.c 2011-05-26 10:21:09 UTC (rev 36913) @@ -127,8 +127,8 @@ modifier_vgroup_cache(md, vertexCos); /* if next modifier needs original vertices */ armature_deform_verts(amd->object, ob, derivedData, vertexCos, NULL, - numVerts, amd->deformflag, - (float(*)[3])amd->prevCos, amd->defgrp_name); + numVerts, amd->deformflag, (float(*)[3])amd->prevCos, amd->defgrp_name); + /* free cache */ if(amd->prevCos) { MEM_freeN(amd->prevCos); @@ -145,9 +145,17 @@ if(!derivedData) dm = CDDM_from_editmesh(editData, ob->data); - armature_deform_verts(amd->object, ob, dm, vertexCos, NULL, numVerts, - amd->deformflag, NULL, amd->defgrp_name); + modifier_vgroup_cache(md, vertexCos); /* if next modifier needs original vertices */ + armature_deform_verts(amd->object, ob, dm, vertexCos, NULL, + numVerts, amd->deformflag, (float(*)[3])amd->prevCos, amd->defgrp_name); + + /* free cache */ + if(amd->prevCos) { + MEM_freeN(amd->prevCos); + amd->prevCos= NULL; + } + if(!derivedData) dm->release(dm); } _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs