Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-04-17 07:17:24 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-17 07:21:24 +0300
commite12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch)
tree8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/blenkernel/BKE_nla.h
parentb3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff)
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/blenkernel/BKE_nla.h')
-rw-r--r--source/blender/blenkernel/BKE_nla.h30
1 files changed, 18 insertions, 12 deletions
diff --git a/source/blender/blenkernel/BKE_nla.h b/source/blender/blenkernel/BKE_nla.h
index 45ac86eebf9..423f79a8049 100644
--- a/source/blender/blenkernel/BKE_nla.h
+++ b/source/blender/blenkernel/BKE_nla.h
@@ -42,8 +42,14 @@ void BKE_nlastrip_free(ListBase *strips, struct NlaStrip *strip, bool do_id_user
void BKE_nlatrack_free(ListBase *tracks, struct NlaTrack *nlt, bool do_id_user);
void BKE_nla_tracks_free(ListBase *tracks, bool do_id_user);
-struct NlaStrip *BKE_nlastrip_copy(struct Main *bmain, struct NlaStrip *strip, const bool use_same_action, const int flag);
-struct NlaTrack *BKE_nlatrack_copy(struct Main *bmain, struct NlaTrack *nlt, const bool use_same_actions, const int flag);
+struct NlaStrip *BKE_nlastrip_copy(struct Main *bmain,
+ struct NlaStrip *strip,
+ const bool use_same_action,
+ const int flag);
+struct NlaTrack *BKE_nlatrack_copy(struct Main *bmain,
+ struct NlaTrack *nlt,
+ const bool use_same_actions,
+ const int flag);
void BKE_nla_tracks_copy(struct Main *bmain, ListBase *dst, ListBase *src, const int flag);
struct NlaTrack *BKE_nlatrack_add(struct AnimData *adt, struct NlaTrack *prev);
@@ -59,7 +65,6 @@ void BKE_nlastrips_sort_strips(ListBase *strips);
bool BKE_nlastrips_add_strip(ListBase *strips, struct NlaStrip *strip);
-
void BKE_nlastrips_make_metas(ListBase *strips, bool is_temp);
void BKE_nlastrips_clear_metas(ListBase *strips, bool only_sel, bool only_temp);
void BKE_nlastrips_clear_metastrip(ListBase *strips, struct NlaStrip *strip);
@@ -98,7 +103,8 @@ bool BKE_nlatrack_has_animated_strips(struct NlaTrack *nlt);
bool BKE_nlatracks_have_animated_strips(ListBase *tracks);
void BKE_nlastrip_validate_fcurves(struct NlaStrip *strip);
-bool BKE_nlastrip_has_curves_for_property(const struct PointerRNA *ptr, const struct PropertyRNA *prop);
+bool BKE_nlastrip_has_curves_for_property(const struct PointerRNA *ptr,
+ const struct PropertyRNA *prop);
void BKE_nla_validate_state(struct AnimData *adt);
@@ -119,14 +125,14 @@ void BKE_nla_tweakmode_exit(struct AnimData *adt);
/* time mapping conversion modes */
enum eNlaTime_ConvertModes {
- /* convert from global time to strip time - for evaluation */
- NLATIME_CONVERT_EVAL = 0,
- /* convert from global time to strip time - for editing corrections */
- // XXX old 0 invert
- NLATIME_CONVERT_UNMAP,
- /* convert from strip time to global time */
- // xxx old 1 invert
- NLATIME_CONVERT_MAP,
+ /* convert from global time to strip time - for evaluation */
+ NLATIME_CONVERT_EVAL = 0,
+ /* convert from global time to strip time - for editing corrections */
+ // XXX old 0 invert
+ NLATIME_CONVERT_UNMAP,
+ /* convert from strip time to global time */
+ // xxx old 1 invert
+ NLATIME_CONVERT_MAP,
};
float BKE_nla_tweakedit_remap(struct AnimData *adt, float cframe, short mode);