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-08-14 16:29:46 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-08-14 16:32:24 +0300
commit03b2371387dcae9f801cabbc1819b1d7e3350829 (patch)
tree0300655f20a06a8e5c807b5fe6263b47c686dedb /source/blender/blenkernel/intern/nla.c
parentbc4fe45aef7e52f9e7a2bd5e370c6791c58af832 (diff)
Cleanup: move trailing comments to avoid wrapping code
Some statements were split across multiple lines because of their trailing comments. In most cases it's clearer to put the comments above.
Diffstat (limited to 'source/blender/blenkernel/intern/nla.c')
-rw-r--r--source/blender/blenkernel/intern/nla.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/source/blender/blenkernel/intern/nla.c b/source/blender/blenkernel/intern/nla.c
index 0b06bfab2ab..2cc1083aba3 100644
--- a/source/blender/blenkernel/intern/nla.c
+++ b/source/blender/blenkernel/intern/nla.c
@@ -448,8 +448,9 @@ static float nlastrip_get_frame_actionclip(NlaStrip *strip, float cframe, short
if (IS_EQF(strip->scale, 0.0f)) {
strip->scale = 1.0f;
}
- scale = fabsf(
- strip->scale); /* scale must be positive - we've got a special flag for reversing */
+
+ /* Scale must be positive - we've got a special flag for reversing. */
+ scale = fabsf(strip->scale);
/* length of referenced action */
actlength = strip->actend - strip->actstart;
@@ -1280,9 +1281,9 @@ static void nlastrip_fix_resize_overlaps(NlaStrip *strip)
* then offset everything else by the remaining defict to give the strip room
*/
nls->start = nls->end - 1.0f;
- offset = ceilf(
- strip->end -
- nls->start); /* XXX: review whether preventing fractionals is good here... */
+
+ /* XXX: review whether preventing fractionals is good here... */
+ offset = ceilf(strip->end - nls->start);
/* apply necessary offset to ensure that the strip has enough space */
for (; nls; nls = nls->next) {
@@ -1329,9 +1330,9 @@ static void nlastrip_fix_resize_overlaps(NlaStrip *strip)
* then offset everything else by the remaining defict to give the strip room
*/
nls->end = nls->start + 1.0f;
- offset = ceilf(
- nls->end -
- strip->start); /* XXX: review whether preventing fractionals is good here... */
+
+ /* XXX: review whether preventing fractionals is good here... */
+ offset = ceilf(nls->end - strip->start);
/* apply necessary offset to ensure that the strip has enough space */
for (; nls; nls = nls->next) {