diff options
| author | Joshua Leung <aligorith@gmail.com> | 2009-07-07 16:17:06 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2009-07-07 16:17:06 +0400 |
| commit | f8c344bd17e09f21b5f022f65016fc13a7aa1d69 (patch) | |
| tree | 4f35b231d86bb6bf89eaa0ae4f54a98679ed6f74 /source/blender/blenkernel/nla_private.h | |
| parent | d1677e36b663f077312050ac46cea0de1b1212c2 (diff) | |
NLA SoC: Meta Strips + F-Modifiers
F-Modifiers now work on 'all' types of NLA Strip. To get them working on Meta-strips, F-Modifiers on the Meta strip must be applied on top of those for child strips. For now, this is done by joining the lists of modifiers, and evaluating the joined list.
Currently, Transitions don't work that great with F-Modifiers yet (only the endpoints get evaluated with the F-Modifiers). Solving this is for another time...
Diffstat (limited to 'source/blender/blenkernel/nla_private.h')
| -rw-r--r-- | source/blender/blenkernel/nla_private.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/nla_private.h b/source/blender/blenkernel/nla_private.h index 016eaedfe4c..df7ffaa3064 100644 --- a/source/blender/blenkernel/nla_private.h +++ b/source/blender/blenkernel/nla_private.h @@ -79,7 +79,7 @@ float nlastrip_get_frame(NlaStrip *strip, float cframe, short mode); /* these functions are only defined here to avoid problems with the order in which they get defined... */ NlaEvalStrip *nlastrips_ctime_get_strip(ListBase *list, ListBase *strips, short index, float ctime); -void nlastrip_evaluate(PointerRNA *ptr, ListBase *channels, NlaEvalStrip *nes); +void nlastrip_evaluate(PointerRNA *ptr, ListBase *channels, ListBase *modifiers, NlaEvalStrip *nes); void nladata_flush_channels(ListBase *channels); #endif // NLA_PRIVATE |