diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-01-14 11:07:57 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2017-01-14 11:10:42 -0300 |
| commit | dcb95ec1473eff3f455909cd81c3cd50b1e1159b (patch) | |
| tree | 60343275911d48ebf993041dec92e1eac112b746 /scene/main/viewport.cpp | |
| parent | 93ab45b6b5c4f8e0619e963156c983009d399a9d (diff) | |
| download | redot-engine-dcb95ec1473eff3f455909cd81c3cd50b1e1159b.tar.gz | |
removed duplicated functions in class hierarchy that were bound more than once
added a check to detect this case in the future
Diffstat (limited to 'scene/main/viewport.cpp')
| -rw-r--r-- | scene/main/viewport.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index ddda90c3fa..c3ece76b05 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -389,7 +389,7 @@ void Viewport::_notification(int p_what) { if (get_parent()) { parent = get_parent()->get_viewport(); - VisualServer::get_singleton()->viewport_set_parent_viewport(viewport,parent->get_viewport()); + VisualServer::get_singleton()->viewport_set_parent_viewport(viewport,parent->get_viewport_rid()); } else { parent=NULL; } @@ -736,7 +736,7 @@ void Viewport::_notification(int p_what) { } } -RID Viewport::get_viewport() const { +RID Viewport::get_viewport_rid() const { return viewport; } @@ -2754,7 +2754,7 @@ void Viewport::_bind_methods() { ClassDB::bind_method(_MD("set_physics_object_picking","enable"), &Viewport::set_physics_object_picking); ClassDB::bind_method(_MD("get_physics_object_picking"), &Viewport::get_physics_object_picking); - ClassDB::bind_method(_MD("get_viewport"), &Viewport::get_viewport); + ClassDB::bind_method(_MD("get_viewport_rid"), &Viewport::get_viewport_rid); ClassDB::bind_method(_MD("input","local_event"), &Viewport::input); ClassDB::bind_method(_MD("unhandled_input","local_event"), &Viewport::unhandled_input); |