tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Cleanup: NLA, reformatting code 

No functional changes.
This commit is contained in:
Sybren A. Stüvel 2022-07-05 11:34:40 +02:00
parent bd00324c26
commit fdb854b932
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/blenkernel/BKE_nla.h
View File

@ -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);
/**

2
source/blender/blenkernel/intern/nla.c
View File

@ -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;

11
source/blender/makesrna/intern/rna_nla.c
View File

@ -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.");