diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2021-01-27 20:44:59 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2021-01-27 20:44:59 +0300 |
| commit | c604fd56a79eab8d1a5d50937b1ef1d0034dc2e1 (patch) | |
| tree | d9756354eab29eef6fca889acc72f410c0f86bc1 /source/blender/editors/animation | |
| parent | 4c4ccdfa3663695950f409ed6a07c446b9f56093 (diff) | |
| parent | 37e60289c2099148dddc7fdd7a8855c2c0a97328 (diff) | |
Merge branch 'blender-v2.92-release'
Diffstat (limited to 'source/blender/editors/animation')
| -rw-r--r-- | source/blender/editors/animation/anim_markers.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c index a77864415ce..2ab809c3633 100644 --- a/source/blender/editors/animation/anim_markers.c +++ b/source/blender/editors/animation/anim_markers.c @@ -749,8 +749,8 @@ static bool ed_marker_move_use_time(MarkerMove *mm) ((mm->slink->spacetype == SPACE_ACTION) && (((SpaceAction *)mm->slink)->flag & SACTION_DRAWTIME)) || ((mm->slink->spacetype == SPACE_GRAPH) && - !(((SpaceGraph *)mm->slink)->flag & SIPO_DRAWTIME)) || - ((mm->slink->spacetype == SPACE_NLA) && !(((SpaceNla *)mm->slink)->flag & SNLA_DRAWTIME))) { + (((SpaceGraph *)mm->slink)->flag & SIPO_DRAWTIME)) || + ((mm->slink->spacetype == SPACE_NLA) && (((SpaceNla *)mm->slink)->flag & SNLA_DRAWTIME))) { return true; } |