diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-06-16 23:51:58 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-06-16 23:51:58 +0400 |
| commit | ecb39291e97742524ff6b091bbca22a5a915f92c (patch) | |
| tree | 360f919c519ce19564064757c8bdf578ab7fa566 /source/blender | |
| parent | 55f1a1dcad5621f323dd76ca3cfcec06677e00be (diff) | |
| parent | 2faf20c4b3ae1ca6c82dd2a942d2f2a580685436 (diff) | |
small merge needed for testing new animsys in 2.5 BGE, mixing own changes with merge can be a hassle.
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r20928:20937
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/intern/action.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c index d54bc749b71..fb1b2e9cf70 100644 --- a/source/blender/blenkernel/intern/action.c +++ b/source/blender/blenkernel/intern/action.c @@ -800,6 +800,7 @@ void calc_action_range(const bAction *act, float *start, float *end, int incl_hi /* Copy the data from the action-pose (src) into the pose */ /* both args are assumed to be valid */ /* exported to game engine */ +/* Note! this assumes both poses are aligned, this isnt always true when dealing with user poses */ void extract_pose_from_pose(bPose *pose, const bPose *src) { const bPoseChannel *schan; @@ -810,7 +811,7 @@ void extract_pose_from_pose(bPose *pose, const bPose *src) return; } - for (schan=src->chanbase.first; schan; schan=schan->next, pchan= pchan->next) { + for (schan=src->chanbase.first; (schan && pchan); schan=schan->next, pchan= pchan->next) { copy_pose_channel_data(pchan, schan); } } |