[Bf-blender-cvs] [e39528b3511] master: Fix marker name drawing without intended offset in some cases
Brecht Van Lommel
noreply at git.blender.org
Tue Aug 27 13:05:11 CEST 2019
Commit: e39528b351169e8ca1d6c61a00db4a4abafcb7af
Author: Brecht Van Lommel
Date: Tue Aug 27 13:03:33 2019 +0200
Branches: master
https://developer.blender.org/rBe39528b351169e8ca1d6c61a00db4a4abafcb7af
Fix marker name drawing without intended offset in some cases
Order of arguments matters here.
===================================================================
M source/blender/editors/animation/anim_markers.c
===================================================================
diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c
index ded59466370..8c873eb6b45 100644
--- a/source/blender/editors/animation/anim_markers.c
+++ b/source/blender/editors/animation/anim_markers.c
@@ -486,7 +486,7 @@ static void draw_marker(
float name_y = UI_DPI_FAC * 18;
/* Give an offset to the marker name when selected,
* or when near the current frame (5 frames range, starting from the current one). */
- if ((marker->flag & SELECT) || (IN_RANGE_INCL(marker->frame, cfra, cfra - 4))) {
+ if ((marker->flag & SELECT) || (IN_RANGE_INCL(marker->frame, cfra - 4, cfra))) {
name_y += UI_DPI_FAC * 10;
}
draw_marker_name(fstyle, marker, xpos, name_y);
More information about the Bf-blender-cvs
mailing list