From 43e968dc7854cb775c292889f91f200c1b6b738b Mon Sep 17 00:00:00 2001 From: Pratik Borhade Date: Tue, 19 Mar 2024 10:26:29 +0100 Subject: [PATCH] Fix #119612: Markers bar in NLA blocks view of final track in list Mistake in a96f1208cc729f2b4cfaf8152f80d49f627c82b5. When markers are present, offset should be added to the height. Earlier it was subtracted like so `v2d->tot.ymin -= MarkerMargin` and that worked because ymin is assigned like so `v2d->tot.ymin = -height`. Now that the marker margin is added to the height it needs to be additive. Pull Request: https://projects.blender.org/blender/blender/pulls/119647 --- source/blender/editors/space_nla/space_nla.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/blender/editors/space_nla/space_nla.cc b/source/blender/editors/space_nla/space_nla.cc index 0b16e9a608b..11672051a95 100644 --- a/source/blender/editors/space_nla/space_nla.cc +++ b/source/blender/editors/space_nla/space_nla.cc @@ -197,7 +197,7 @@ static void nla_track_region_draw(const bContext *C, ARegion *region) * `UI_view2d_view_ortho`.*/ int height = NLATRACK_TOT_HEIGHT(&ac, item_count); if (!BLI_listbase_is_empty(ED_context_get_markers(C))) { - height -= (UI_MARKER_MARGIN_Y - NLATRACK_STEP(snla)); + height += (UI_MARKER_MARGIN_Y - NLATRACK_STEP(snla)); } v2d->tot.ymin = -height; UI_view2d_curRect_clamp_y(v2d);