← Back to branch summary

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

« back to all changes in this revision

Viewing changes to source/blender/makesdna/DNA_key_types.h

  • 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/makesdna/DNA_key_types.h
60
60
        int uid;           /* for meshes only, match the unique number with the customdata layer */
61
61
        
62
62
        void  *data;       /* array of shape key values, size is (Key->elemsize * KeyBlock->totelem) */
63
 
        float *weights;    /* store an aligned array of weights from 'vgroup' */
64
63
        char   name[64];   /* MAX_NAME (unique name, user assigned) */
65
64
        char   vgroup[64]; /* MAX_VGROUP_NAME (optional vertex group), array gets allocated into 'weights' when set */
66
65