← 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_constraint_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_constraint_types.h
407
407
        struct Object           *target;
408
408
        float           dist;                   /* distance to kept from target */
409
409
        short           shrinkType;             /* shrink type (look on MOD shrinkwrap for values) */
410
 
        char            projAxis;               /* axis to project over UP_X, UP_Y, UP_Z */
411
 
        char            pad[9];
 
410
        char            projAxis;               /* axis to project/constrain */
 
411
        char            projAxisSpace;  /* space to project axis in */
 
412
        float           projLimit;              /* distance to search */
 
413
        char            pad[4];
412
414
} bShrinkwrapConstraint;
413
415
 
414
416
/* Follow Track constraints */