diff options
| author | Ton Roosendaal <ton@blender.org> | 2006-01-04 01:09:25 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2006-01-04 01:09:25 +0300 |
| commit | bd26fe8f94dd0f8ee558df1e7c877eba3db912be (patch) | |
| tree | 5727966f3a09fc8f9478eedb4f451d6b399b0bdf /source/blender/blenkernel | |
| parent | f47899fc0f716464625f43045458e222ce11603d (diff) | |
Orange: Another issue with Armature layers; in NLA, the strips with a
locked length should not skip hidden channels.
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/BKE_action.h | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/action.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/BKE_action.h b/source/blender/blenkernel/BKE_action.h index 0189b7a2826..9abd73d7bef 100644 --- a/source/blender/blenkernel/BKE_action.h +++ b/source/blender/blenkernel/BKE_action.h @@ -111,7 +111,7 @@ struct bAction *copy_action(struct bAction *src); /** * Some kind of bounding box operation on the action. */ -void calc_action_range(const struct bAction *act, float *start, float *end); +void calc_action_range(const struct bAction *act, float *start, float *end, int incl_hidden); /** * Set the pose channels from the given action. diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c index 1aaf4c6f2c1..50ce4495f9c 100644 --- a/source/blender/blenkernel/intern/action.c +++ b/source/blender/blenkernel/intern/action.c @@ -427,7 +427,7 @@ void blend_poses(bPose *dst, bPose *src, float srcweight, short mode) } -void calc_action_range(const bAction *act, float *start, float *end) +void calc_action_range(const bAction *act, float *start, float *end, int incl_hidden) { const bActionChannel *chan; const bConstraintChannel *conchan; @@ -437,7 +437,7 @@ void calc_action_range(const bAction *act, float *start, float *end) if(act) { for (chan=act->chanbase.first; chan; chan=chan->next) { - if((chan->flag & ACHAN_HIDDEN)==0) { + if(incl_hidden || (chan->flag & ACHAN_HIDDEN)==0) { if(chan->ipo) { for (icu=chan->ipo->curve.first; icu; icu=icu->next) { if(icu->totvert) { |