diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-10-28 19:51:06 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-10-28 19:51:43 +0300 |
| commit | 2f0bdcb306999ff610ecc6073af27b2311924153 (patch) | |
| tree | 42defbba6d22513cfd8fc76d6a752db8ff6ede67 /source/blender/editors/space_text | |
| parent | ba76f0c6a29e3955ead99b32d2fb41c534c1dbc5 (diff) | |
Fix T41041: 'Delete keyframe' removes markers too
Operators that trigger UI events (but nothing else)
were using 'CANCELLED' making it impossible to tell if an invoke
function failed, or opened a menu.
Diffstat (limited to 'source/blender/editors/space_text')
| -rw-r--r-- | source/blender/editors/space_text/text_ops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_text/text_ops.c b/source/blender/editors/space_text/text_ops.c index 852edaac7dc..3b3c86d6c06 100644 --- a/source/blender/editors/space_text/text_ops.c +++ b/source/blender/editors/space_text/text_ops.c @@ -3173,7 +3173,7 @@ static int text_resolve_conflict_invoke(bContext *C, wmOperator *op, const wmEve break; } - return OPERATOR_CANCELLED; + return OPERATOR_INTERFACE; } void TEXT_OT_resolve_conflict(wmOperatorType *ot) |