Merge branch 'master'

This commit is contained in:
David Capello 2015-11-13 11:08:39 -03:00
commit 6889b08090
2 changed files with 2 additions and 2 deletions

View File

@ -68,7 +68,7 @@ namespace app {
kShowOnionskin = 4,
kShowOutside = 8,
kShowDecorators = 16,
kShowSymmetryLine = 2,
kShowSymmetryLine = 32,
kDefaultEditorFlags = (kShowGrid |
kShowMask |
kShowOnionskin |

View File

@ -96,7 +96,7 @@ namespace app {
// Called when a key is released.
virtual bool onKeyUp(Editor* editor, ui::KeyMessage* msg) { return false; }
// Called when a key is released.
// Called when status bar needs to be updated.
virtual bool onUpdateStatusBar(Editor* editor) { return false; }
// When a part of the sprite will be exposed.