diff options
author | Sybren A. Stüvel <sybren@blender.org> | 2022-07-05 12:34:40 +0300 |
---|---|---|
committer | Sybren A. Stüvel <sybren@blender.org> | 2022-07-05 12:34:40 +0300 |
commit | fdb854b9320d66297c8d1f03746b340b0798ed86 (patch) | |
tree | b5780f5b98b7a9a64c070a93c1686dea6163e8a7 /source | |
parent | bd00324c264c07d7872071e9ef888b6b92e5645f (diff) |
Cleanup: NLA, reformatting code
No functional changes.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/BKE_nla.h | 5 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/nla.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_nla.c | 11 |
3 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/blenkernel/BKE_nla.h b/source/blender/blenkernel/BKE_nla.h index a9444156498..11642763074 100644 --- a/source/blender/blenkernel/BKE_nla.h +++ b/source/blender/blenkernel/BKE_nla.h @@ -8,7 +8,7 @@ */ /* temp constant defined for these funcs only... */ -# define NLASTRIP_MIN_LEN_THRESH 0.1f +#define NLASTRIP_MIN_LEN_THRESH 0.1f #ifdef __cplusplus extern "C" { @@ -229,7 +229,8 @@ bool BKE_nlatrack_is_nonlocal_in_liboverride(const struct ID *id, const struct N * - the macro MINFRAMEF, if no strips are to the left of this strip in its track * * \param strip The strip to compute the left-hand-side 'frame limit' of. - * \return The beginning frame of the previous strip, or MINFRAMEF if no strips are next in that track. + * \return The beginning frame of the previous strip, or MINFRAMEF if no strips are next in that + * track. */ float BKE_nlastrip_compute_frame_from_previous_strip(struct NlaStrip *strip); /** diff --git a/source/blender/blenkernel/intern/nla.c b/source/blender/blenkernel/intern/nla.c index 3af5e4789d2..9457c20eb7d 100644 --- a/source/blender/blenkernel/intern/nla.c +++ b/source/blender/blenkernel/intern/nla.c @@ -1256,7 +1256,7 @@ float BKE_nlastrip_compute_frame_from_previous_strip(NlaStrip *strip) return limit_prev; } -float BKE_nlastrip_compute_frame_to_next_strip(NlaStrip* strip) +float BKE_nlastrip_compute_frame_to_next_strip(NlaStrip *strip) { float limit_next = MAXFRAMEF; diff --git a/source/blender/makesrna/intern/rna_nla.c b/source/blender/makesrna/intern/rna_nla.c index f1aa9925a41..5af3f94d075 100644 --- a/source/blender/makesrna/intern/rna_nla.c +++ b/source/blender/makesrna/intern/rna_nla.c @@ -337,7 +337,6 @@ static void rna_NlaStrip_frame_end_ui_set(PointerRNA *ptr, float value) else { data->repeat -= (action_length_delta / actlen); } - } } @@ -749,9 +748,9 @@ static void rna_def_nlastrip(BlenderRNA *brna) RNA_def_property_float_sdna(prop, NULL, "start"); RNA_def_property_float_funcs(prop, NULL, "rna_NlaStrip_frame_start_ui_set", NULL); RNA_def_property_ui_text( - prop, - "Start Frame (manipulated from UI)", - "Start frame of the NLA strip. Note : changing this value also updates the value of " + prop, + "Start Frame (manipulated from UI)", + "Start frame of the NLA strip. Note : changing this value also updates the value of " "the strip's end frame. If only the start frame should be changed, see the \"frame_start\" " "property instead."); RNA_def_property_update( @@ -761,8 +760,8 @@ static void rna_def_nlastrip(BlenderRNA *brna) RNA_def_property_float_sdna(prop, NULL, "end"); RNA_def_property_float_funcs(prop, NULL, "rna_NlaStrip_frame_end_ui_set", NULL); RNA_def_property_ui_text( - prop, - "End Frame (manipulated from UI)", + prop, + "End Frame (manipulated from UI)", "End frame of the NLA strip. Note : changing this value also updates the value of " "the strip's start frame. If only the end frame should be changed, see the \"frame_end\" " "property instead."); |