diff options
| author | Ian Thompson <quornian@googlemail.com> | 2008-08-16 18:38:08 +0400 |
|---|---|---|
| committer | Ian Thompson <quornian@googlemail.com> | 2008-08-16 18:38:08 +0400 |
| commit | 310a6e2179a9c55acbe3bdb833ff8420bd6eb216 (patch) | |
| tree | 600444f8def0f5f7f5973c4ddb6b2e783d026365 /source/blender/src/drawtext.c | |
| parent | d1d1d2b8702230138d4fddbafa63ce1e66a7ea0c (diff) | |
Esc removes markers in stages. Temporary markers are removed first (if any) then other markers follow.
Diffstat (limited to 'source/blender/src/drawtext.c')
| -rw-r--r-- | source/blender/src/drawtext.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c index 15bf97f19f7..3c201663072 100644 --- a/source/blender/src/drawtext.c +++ b/source/blender/src/drawtext.c @@ -2483,6 +2483,12 @@ static short do_markers(SpaceText *st, char ascii, unsigned short evnt, short va draw= 1; swallow= 1; } + } else if (evnt==ESCKEY) { + if (txt_clear_markers(text, TMARK_TEMP)) swallow= 1; + else if (txt_clear_markers(text, 0)) swallow= 1; + else return 0; + evnt= ascii= val= 0; + draw= 1; } if (!swallow) return 0; } @@ -3113,9 +3119,6 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt) do_draw= 1; pop_space_text(st); break; - case ESCKEY: - txt_clear_markers(text, TMARK_TEMP); - break; case BACKSPACEKEY: if (text && text->id.lib) { error_libdata(); |