[Bf-blender-cvs] [c36c403cdb7] master: Cleanup: Removed handling of unused flag in TimeMarkers
Colin Basnett
noreply at git.blender.org
Thu Sep 8 03:13:16 CEST 2022
Commit: c36c403cdb7e8a9d9c0b7aa1765e42fc0e9818d0
Author: Colin Basnett
Date: Wed Sep 7 18:12:32 2022 -0700
Branches: master
https://developer.blender.org/rBc36c403cdb7e8a9d9c0b7aa1765e42fc0e9818d0
Cleanup: Removed handling of unused flag in TimeMarkers
This removes the defunct handling of the ACTIVE flag in
TimeMarker::flags. It's not possible for that flag to be set though
normal operation.
Differential Revision: https://developer.blender.org/D15828
===================================================================
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 2e324cb3ed8..e96e561c537 100644
--- a/source/blender/editors/animation/anim_markers.c
+++ b/source/blender/editors/animation/anim_markers.c
@@ -459,9 +459,7 @@ static void draw_marker_line(const uchar *color, int xpos, int ymin, int ymax)
static int marker_get_icon_id(TimeMarker *marker, int flag)
{
if (flag & DRAW_MARKERS_LOCAL) {
- return (marker->flag & ACTIVE) ? ICON_PMARKER_ACT :
- (marker->flag & SELECT) ? ICON_PMARKER_SEL :
- ICON_PMARKER;
+ return (marker->flag & SELECT) ? ICON_PMARKER_SEL : ICON_PMARKER;
}
#ifdef DURIAN_CAMERA_SWITCH
if (marker->camera) {
More information about the Bf-blender-cvs
mailing list