← Back to branch summary

~siretart/ubuntu/utopic/blender/libav10

« back to all changes in this revision

Viewing changes to source/blender/modifiers/intern/MOD_meshdeform.c

  • Committer: Reinhard Tartler
  • Date: 2014-05-31 01:50:05 UTC
  • mfrom: (14.2.27 sid)
  • Revision ID: siretart@tauware.de-20140531015005-ml6druahuj82nsav
merge from debian

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/modifiers/intern/MOD_meshdeform.c
82
82
        MeshDeformModifierData *tmmd = (MeshDeformModifierData *) target;
83
83
 
84
84
        tmmd->gridsize = mmd->gridsize;
 
85
        tmmd->flag = mmd->flag;
85
86
        tmmd->object = mmd->object;
86
87
}
87
88
 
199
200
 
200
201
        if (!mmd->object || (!mmd->bindcagecos && !mmd->bindfunc))
201
202
                return;
202
 
        
 
203
 
203
204
        /* get cage derivedmesh */
204
205
        if (em) {
205
 
                tmpdm = editbmesh_get_derived_cage_and_final(md->scene, ob, em, &cagedm, 0);
 
206
                tmpdm = editbmesh_get_derived_cage_and_final(md->scene, mmd->object, em, &cagedm, 0);
206
207
                if (tmpdm)
207
208
                        tmpdm->release(tmpdm);
208
209
        }
346
347
        DerivedMesh *dm = get_dm(ob, NULL, derivedData, NULL, false, false);
347
348
 
348
349
        modifier_vgroup_cache(md, vertexCos); /* if next modifier needs original vertices */
349
 
        
 
350
 
350
351
        meshdeformModifier_do(md, ob, dm, vertexCos, numVerts);
351
352
 
352
353
        if (dm && dm != derivedData)