[Bf-blender-cvs] [9e3bca4d1b1] draw-deferred-compilation-experiment: Fix T97497: NLA strip names are now properly contained within the strip bounds

Colin Basnett noreply at git.blender.org
Thu Apr 21 11:14:17 CEST 2022


Commit: 9e3bca4d1b1e2a85c7f37f8f81a2b5c6dd4c7a7e
Author: Colin Basnett
Date:   Thu Apr 21 10:45:17 2022 +0200
Branches: draw-deferred-compilation-experiment
https://developer.blender.org/rB9e3bca4d1b1e2a85c7f37f8f81a2b5c6dd4c7a7e

Fix T97497: NLA strip names are now properly contained within the strip bounds

Very easy fix, the bug seemed to be a result of a typo on the right-most margin.

Old: {F13013777}

New: {F13013782}

Maniphest Tasks: T97497

Differential Revision: https://developer.blender.org/D14711

===================================================================

M	source/blender/editors/space_nla/nla_draw.c

===================================================================

diff --git a/source/blender/editors/space_nla/nla_draw.c b/source/blender/editors/space_nla/nla_draw.c
index eda9f89b51c..80efaf4ed9f 100644
--- a/source/blender/editors/space_nla/nla_draw.c
+++ b/source/blender/editors/space_nla/nla_draw.c
@@ -744,7 +744,7 @@ void draw_nla_main_data(bAnimContext *ac, SpaceNla *snla, ARegion *region)
           for (strip = nlt->strips.first, index = 1; strip; strip = strip->next, index++) {
             if (BKE_nlastrip_within_bounds(strip, v2d->cur.xmin, v2d->cur.xmax)) {
               const float xminc = strip->start + text_margin_x;
-              const float xmaxc = strip->end + text_margin_x;
+              const float xmaxc = strip->end - text_margin_x;
 
               /* draw the visualization of the strip */
               nla_draw_strip(snla, adt, nlt, strip, v2d, ymin, ymax);



More information about the Bf-blender-cvs mailing list