[Bf-blender-cvs] [37e60289c20] blender-v2.92-release: Fix T85110: moving markers num input confuses time vs frames
Philipp Oeser
noreply at git.blender.org
Wed Jan 27 18:44:13 CET 2021
Commit: 37e60289c2099148dddc7fdd7a8855c2c0a97328
Author: Philipp Oeser
Date: Wed Jan 27 15:47:43 2021 +0100
Branches: blender-v2.92-release
https://developer.blender.org/rB37e60289c2099148dddc7fdd7a8855c2c0a97328
Fix T85110: moving markers num input confuses time vs frames
Looks like a typo in rB66b84ad1592d.
Maniphest Tasks: T85110
Differential Revision: https://developer.blender.org/D10225
===================================================================
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 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;
}
More information about the Bf-blender-cvs
mailing list