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/2d | |
| parent | 93ab45b6b5c4f8e0619e963156c983009d399a9d (diff) | |
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/2d')
| -rw-r--r-- | scene/2d/camera_2d.cpp | 4 | ||||
| -rw-r--r-- | scene/2d/canvas_item.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scene/2d/camera_2d.cpp b/scene/2d/camera_2d.cpp index 882ae69a2b..0bafef1b83 100644 --- a/scene/2d/camera_2d.cpp +++ b/scene/2d/camera_2d.cpp @@ -252,7 +252,7 @@ void Camera2D::_notification(int p_what) { canvas = get_canvas(); - RID vp = viewport->get_viewport(); + RID vp = viewport->get_viewport_rid(); group_name = "__cameras_"+itos(vp.get_id()); canvas_group_name ="__cameras_c"+itos(canvas.get_id()); @@ -573,7 +573,7 @@ void Camera2D::set_custom_viewport(Node *p_viewport) { else viewport=get_viewport(); - RID vp = viewport->get_viewport(); + RID vp = viewport->get_viewport_rid(); group_name = "__cameras_"+itos(vp.get_id()); canvas_group_name ="__cameras_c"+itos(canvas.get_id()); add_to_group(group_name); diff --git a/scene/2d/canvas_item.cpp b/scene/2d/canvas_item.cpp index 809469c3a3..817707f96e 100644 --- a/scene/2d/canvas_item.cpp +++ b/scene/2d/canvas_item.cpp @@ -818,7 +818,7 @@ Ref<World2D> CanvasItem::get_world_2d() const { RID CanvasItem::get_viewport_rid() const { ERR_FAIL_COND_V(!is_inside_tree(),RID()); - return get_viewport()->get_viewport(); + return get_viewport()->get_viewport_rid(); } void CanvasItem::set_block_transform_notify(bool p_enable) { |