diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-01-13 12:51:14 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2017-01-13 12:51:14 -0300 |
| commit | e53c247cb16b25b828461f32533da64f4fab0e0b (patch) | |
| tree | 985328cee0387b987889ecccb65293bf87883dec /tools | |
| parent | 0ad9939603a3d659f3f9cfba095a2e0c082483e8 (diff) | |
Created new Engine singleton, and moved engine related OS functions to it.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/editor/animation_editor.cpp | 4 | ||||
| -rw-r--r-- | tools/editor/editor_node.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/editor/animation_editor.cpp b/tools/editor/animation_editor.cpp index 4937407cc8..bdf4e83236 100644 --- a/tools/editor/animation_editor.cpp +++ b/tools/editor/animation_editor.cpp @@ -3289,14 +3289,14 @@ bool AnimationKeyEditor::has_keying() const { void AnimationKeyEditor::_query_insert(const InsertData& p_id) { - if (insert_frame!=OS::get_singleton()->get_frames_drawn()) { + if (insert_frame!=Engine::get_singleton()->get_frames_drawn()) { //clear insert list for the frame if frame changed if (insert_confirm->is_visible_in_tree()) return; //do nothing insert_data.clear(); insert_query=false; } - insert_frame=OS::get_singleton()->get_frames_drawn(); + insert_frame=Engine::get_singleton()->get_frames_drawn(); for (List<InsertData>::Element *E=insert_data.front();E;E=E->next()) { //prevent insertion of multiple tracks diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp index 92a2d1f3a6..b4a2da4833 100644 --- a/tools/editor/editor_node.cpp +++ b/tools/editor/editor_node.cpp @@ -258,7 +258,7 @@ void EditorNode::_notification(int p_what) { //get_root_node()->set_rect(viewport->get_global_rect()); //update the circle - uint64_t frame = OS::get_singleton()->get_frames_drawn(); + uint64_t frame = Engine::get_singleton()->get_frames_drawn(); uint32_t tick = OS::get_singleton()->get_ticks_msec(); if (frame!=circle_step_frame && (tick-circle_step_msec)>(1000/8)) { @@ -6614,7 +6614,7 @@ EditorNode::EditorNode() { circle_step_msec=OS::get_singleton()->get_ticks_msec(); - circle_step_frame=OS::get_singleton()->get_frames_drawn(); + circle_step_frame=Engine::get_singleton()->get_frames_drawn(); circle_step=0; _rebuild_import_menu(); |