diff options
| author | Julian Eisel <julian@blender.org> | 2020-08-07 14:04:31 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2020-08-07 14:04:31 +0300 |
| commit | 0d2d4a6d4a75ac38c41f872c88255eab70e88ab7 (patch) | |
| tree | b7a7518af86dddba48e05a98b3c2be55e8804721 /source/blender/blenkernel/nla_private.h | |
| parent | 9b416c66fb714bdfd15a481489dbf650d0f389ea (diff) | |
| parent | cfc6f9eb18e701f5be601b95c45004e8cf7fbc81 (diff) | |
Merge branch 'master' into temp-ui-button-type-refactortemp-ui-button-type-refactor
Diffstat (limited to 'source/blender/blenkernel/nla_private.h')
| -rw-r--r-- | source/blender/blenkernel/nla_private.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/source/blender/blenkernel/nla_private.h b/source/blender/blenkernel/nla_private.h index c72747a8c51..7057e9ab5bd 100644 --- a/source/blender/blenkernel/nla_private.h +++ b/source/blender/blenkernel/nla_private.h @@ -21,8 +21,7 @@ * \ingroup bke */ -#ifndef __NLA_PRIVATE_H__ -#define __NLA_PRIVATE_H__ +#pragma once #include "BLI_bitmap.h" #include "BLI_ghash.h" @@ -32,6 +31,8 @@ extern "C" { #endif +struct AnimationEvalContext; + /* --------------- NLA Evaluation DataTypes ----------------------- */ /* used for list of strips to accumulate at current time */ @@ -168,13 +169,17 @@ 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, const bool flush_to_original); +NlaEvalStrip *nlastrips_ctime_get_strip(ListBase *list, + ListBase *strips, + short index, + const struct AnimationEvalContext *anim_eval_context, + const bool flush_to_original); void nlastrip_evaluate(PointerRNA *ptr, NlaEvalData *channels, ListBase *modifiers, NlaEvalStrip *nes, NlaEvalSnapshot *snapshot, + const struct AnimationEvalContext *anim_eval_context, const bool flush_to_original); void nladata_flush_channels(PointerRNA *ptr, NlaEvalData *channels, @@ -184,5 +189,3 @@ void nladata_flush_channels(PointerRNA *ptr, #ifdef __cplusplus } #endif - -#endif /* __NLA_PRIVATE_H__ */ |