← Back to branch summary

~ubuntu-branches/ubuntu/utopic/blender/utopic-proposed

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2014-02-19 11:24:23 UTC
  • mfrom: (14.2.23 sid)
  • Revision ID: package-import@ubuntu.com-20140219112423-rkmaz2m7ha06d4tk
Tags: 2.69-3ubuntu1
* Merge with Debian; remaining changes:
  - Configure without OpenImageIO on armhf, as it is not available on
    Ubuntu.

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/modifiers/intern/MOD_shapekey.c
55
55
                        ModifierApplyFlag UNUSED(flag))
56
56
{
57
57
        Key *key = BKE_key_from_object(ob);
58
 
        float (*deformedVerts)[3];
59
58
 
60
59
        if (key && key->block.first) {
61
60
                int deformedVerts_tot;
62
 
                deformedVerts = (float(*)[3])BKE_key_evaluate_object(md->scene, ob, &deformedVerts_tot);
63
 
                if (deformedVerts) {
64
 
                        if (numVerts == deformedVerts_tot) {
65
 
                                memcpy(vertexCos, deformedVerts, sizeof(float) * 3 * numVerts);
66
 
                        }
67
 
                        MEM_freeN(deformedVerts);
68
 
                }
 
61
                BKE_key_evaluate_object_ex(md->scene, ob, &deformedVerts_tot,
 
62
                                           (float *)vertexCos, sizeof(*vertexCos) * numVerts);
 
63
 
69
64
        }
70
65
}
71
66