diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-07-07 03:46:48 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-07-07 03:46:48 +0400 |
| commit | b7b50298148ef502d14143b0a5fa01dfac2ecce4 (patch) | |
| tree | 7c47cc7777b79bb375bc2f939c34233e6671e10d /source/blender/blenkernel/intern/anim_sys.c | |
| parent | 98a7ca61fa905792bd3fdfa6c29f44691c9582ac (diff) | |
| parent | 3a0593cc3d5de33248b3a7b913a45729c37dc1b4 (diff) | |
Merged changes in the trunk up to revision 48695.
Diffstat (limited to 'source/blender/blenkernel/intern/anim_sys.c')
| -rw-r--r-- | source/blender/blenkernel/intern/anim_sys.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c index e5701927b07..e4ecdf245d1 100644 --- a/source/blender/blenkernel/intern/anim_sys.c +++ b/source/blender/blenkernel/intern/anim_sys.c @@ -1864,7 +1864,7 @@ static void nlastrip_evaluate_transition(PointerRNA *ptr, ListBase *channels, Li /* prepare template for 'evaluation strip' * - based on the transition strip's evaluation strip data * - strip_mode is NES_TIME_TRANSITION_* based on which endpoint - * - strip_time is the 'normalised' (i.e. in-strip) time for evaluation, + * - strip_time is the 'normalized' (i.e. in-strip) time for evaluation, * which doubles up as an additional weighting factor for the strip influences * which allows us to appear to be 'interpolating' between the two extremes */ |