diff options
| author | Joshua Leung <aligorith@gmail.com> | 2007-09-09 15:54:12 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2007-09-09 15:54:12 +0400 |
| commit | 3a51aed18de35963845339bcd72e7c5085dc6e1f (patch) | |
| tree | bcae8216f32310830a3c63ee2f3e33b5bff2af64 | |
| parent | 8ddbd84240e6d0cd8ca152ff95c473c6b2e9a910 (diff) | |
Bugfix #6923:
NLA was calculating extensions of strips in the wrong order. This was not an issue in many cases, although it is highlighted in the following case:
[strip 1 - 'hold' is on] ----------------------------
[strip 2 ]
Logically, the end of strip 1 would hold on until the start of strip 2. However, the start of strip 2 was extended to the end of strip 1 instead.
| -rw-r--r-- | source/blender/blenkernel/intern/action.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c index cbe056fa1b1..e10a17a3338 100644 --- a/source/blender/blenkernel/intern/action.c +++ b/source/blender/blenkernel/intern/action.c @@ -1071,10 +1071,10 @@ static void do_nla(Object *ob, int blocktype) } } if(strip==NULL) { /* extend */ - if(stripfirst) - scene_cfra= stripfirst->start; - else if(striplast) + if(striplast) scene_cfra= striplast->end; + else if(stripfirst) + scene_cfra= stripfirst->start; } /* and now go over all strips */ |