Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

removed duplicated functions in class hierarchy that were bound more than once

Browse source 
added a check to detect this case in the future
This commit is contained in:
Juan Linietsky 2017-01-14 11:07:57 -03:00
parent 93ab45b6b5
commit dcb95ec147
46 changed files with 179 additions and 210 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scene/2d/camera_2d.cpp
View file

@ -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);