diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2014-11-05 21:20:42 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2014-11-05 21:20:42 -0300 |
| commit | 0dbedd18fc62f700e92a4cf581e505d849bc47ad (patch) | |
| tree | 8f2c85b4d9227e441fd35ab4873009faa656bcba /scene/main/canvas_layer.cpp | |
| parent | d14baf6e41bcdbe4968e0513beccc09dfb160ecd (diff) | |
| download | redot-engine-0dbedd18fc62f700e92a4cf581e505d849bc47ad.tar.gz | |
SceneMainLoop -> SceneTree
-=-=-=-=-=-=-=-=-=-=-=-=-=-
*YOUR SOURCE MIGHT NOT WORK*
For mor information on fix:
https://github.com/okamstudio/godot/wiki/devel_scene_tree
Other stuff:
-Shower of bullets demo
-Fixes all around
Diffstat (limited to 'scene/main/canvas_layer.cpp')
| -rw-r--r-- | scene/main/canvas_layer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scene/main/canvas_layer.cpp b/scene/main/canvas_layer.cpp index 5006f55daf..ae842577a9 100644 --- a/scene/main/canvas_layer.cpp +++ b/scene/main/canvas_layer.cpp @@ -144,7 +144,7 @@ void CanvasLayer::_notification(int p_what) { switch(p_what) { - case NOTIFICATION_ENTER_SCENE: { + case NOTIFICATION_ENTER_TREE: { Node *n = this; vp=NULL; @@ -169,7 +169,7 @@ void CanvasLayer::_notification(int p_what) { } break; - case NOTIFICATION_EXIT_SCENE: { + case NOTIFICATION_EXIT_TREE: { VisualServer::get_singleton()->viewport_remove_canvas(viewport,canvas->get_canvas()); viewport=RID(); @@ -180,7 +180,7 @@ void CanvasLayer::_notification(int p_what) { Size2 CanvasLayer::get_viewport_size() const { - if (!is_inside_scene()) + if (!is_inside_tree()) return Size2(1,1); Rect2 r = vp->get_visible_rect(); |