Page MenuHome
Differential D5333

Fix T67573: Missing offset in markers names on current frame
ClosedPublic
Actions

Authored by Alessio Monti di Sopra (a.monti) on Jul 24 2019, 1:42 PM.

Details

Reviewers
Jacques Lucke (JacquesLucke)
Commits
rB200c9f37d64a: Fix T67573: Missing offset in marker names on current frame
Summary

The patch makes it so that markers names get an offset in the y axis not only when selected, but also when near the current frame.

The markers get affected for 5 frames in total, as in 2.7, starting from the current to the next four ones.

ps. @Jacques Lucke (JacquesLucke) I might be missing something but, why there are two for loops? They do the same thing and one or the other will execute for sure.

Diff Detail

Repository
rB Blender

Event Timeline

Alessio Monti di Sopra (a.monti) created this revision.Jul 24 2019, 1:42 PM
Jacques Lucke (JacquesLucke) requested changes to this revision.Jul 24 2019, 3:00 PM

The two loops exist so that the selected markers are drawn after the unselected markers.
This is a good case for a comment, feel free to add one.

source/blender/editors/animation/anim_markers.c
487

Use /* A full sentence. */ for comments.

488

Not sure if there is such a thing, but maybe there is a function like in_range. That could be used to simplify the condition.

This revision now requires changes to proceed.Jul 24 2019, 3:00 PM
Alessio Monti di Sopra (a.monti) updated this revision to Diff 16581.Jul 24 2019, 5:02 PM
  • Follow style guide for comments
  • Simplify the condition using IN_RANGE_INCL()
Jacques Lucke (JacquesLucke) accepted this revision.Jul 24 2019, 5:41 PM

Will commit this after the 2.80 release, when the master branch is open again. Please remind me if I forget about it...

This revision is now accepted and ready to land.Jul 24 2019, 5:41 PM
Brecht Van Lommel (brecht) added a subscriber: Brecht Van Lommel (brecht).Jul 31 2019, 2:32 PM

Master branch is open now.

Closed by commit rB200c9f37d64a: Fix T67573: Missing offset in marker names on current frame (authored by Alessio Monti di Sopra (a.monti), committed by Jacques Lucke (JacquesLucke)). · Explain WhyJul 31 2019, 4:18 PM
This revision was automatically updated to reflect the committed changes.
Jacques Lucke (JacquesLucke) added a commit: rB200c9f37d64a: Fix T67573: Missing offset in marker names on current frame.

Revision Contents
Changeset List

PathSize
source/
blender/
editors/
animation/
10 lines

Diff 16578

View Options

source/blender/editors/animation/anim_markers.c

Loading...