diff options
| author | Joshua Leung <aligorith@gmail.com> | 2009-11-05 13:09:45 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2009-11-05 13:09:45 +0300 |
| commit | 06d5d53a240cf98aee52a45317ac2f979be7e58a (patch) | |
| tree | 8f2db7b18112826826213f86aa0a8e20fad0b9c9 /source/blender/makesdna/DNA_constraint_types.h | |
| parent | 751f07d6d486b6388d4eeb78ee0fb672c95739ed (diff) | |
Bugfixes + Spline IK Tweaks:
* #19819: 'Select' operator for Hooks was crashing when Hooks didn't have any vertices assigned yet
* Default twist resolution mode for curves is now 'Minimise'. This seems to work better for Curve Deforms and other purposes. Can be changed if other ways are better after some more testing.
* Spline IK now has more options for controlling how the x and z axis scaling is determined. There is now a choice between using the radius of the curve, the x+z scaling from the bones, or no scaling (default). This does break old files a bit, but this is to have a more stable base for later.
Diffstat (limited to 'source/blender/makesdna/DNA_constraint_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_constraint_types.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_constraint_types.h b/source/blender/makesdna/DNA_constraint_types.h index f5a08764c42..2b24b673185 100644 --- a/source/blender/makesdna/DNA_constraint_types.h +++ b/source/blender/makesdna/DNA_constraint_types.h @@ -169,7 +169,7 @@ typedef struct bSplineIKConstraint { /* settings */ short flag; /* general settings for constraint */ - short upflag; /* axis of bone that points up */ + short xzScaleMode; /* method used for determining the x & z scaling of the bones */ } bSplineIKConstraint; @@ -551,10 +551,16 @@ typedef enum B_CONSTRAINTCHANNEL_FLAG { #define CONSTRAINT_SPLINEIK_NO_ROOT (1<<1) /* bones in the chain should not scale to fit the curve */ #define CONSTRAINT_SPLINEIK_SCALE_LIMITED (1<<2) - /* bones in the chain should take their x/z scales from the curve radius */ -#define CONSTRAINT_SPLINEIK_RAD2FAT (1<<3) /* evenly distribute the bones along the path regardless of length */ -#define CONSTRAINT_SPLINEIK_EVENSPLITS (1<<4) +#define CONSTRAINT_SPLINEIK_EVENSPLITS (1<<3) + +/* bSplineIKConstraint->xzScaleMode */ + /* no x/z scaling */ +#define CONSTRAINT_SPLINEIK_XZS_NONE 0 + /* bones in the chain should take their x/z scales from the curve radius */ +#define CONSTRAINT_SPLINEIK_XZS_RADIUS 1 + /* bones in the chain should take their x/z scales from the original scaling */ +#define CONSTRAINT_SPLINEIK_XZS_ORIGINAL 2 /* MinMax (floor) flags */ #define MINMAX_STICKY 0x01 |