godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix indentation issues in last commits 

Ping @reduz.

(cherry picked from commit 0729c852b4)
This commit is contained in:
Rémi Verschelde 2016-06-07 07:39:40 +02:00
parent cb94271e9f
commit 9791d2ef6d
2 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scene/2d/canvas_item.cpp
View File

@ -482,7 +482,6 @@ void CanvasItem::_enter_canvas() {
} else {
CanvasItem *parent = get_parent_item();
canvas_layer=parent->canvas_layer;
VisualServer::get_singleton()->canvas_item_set_parent(canvas_item,parent->get_canvas_item());

3
scene/main/viewport.cpp
View File

@ -1492,9 +1492,8 @@ void Viewport::_gui_call_input(Control *p_control,const InputEvent& p_input) {
if (!control->is_inside_tree())
break;
control->emit_signal(SceneStringNames::get_singleton()->input_event,p_input);
if (!control->is_inside_tree() || control->is_set_as_toplevel()) {
if (!control->is_inside_tree() || control->is_set_as_toplevel())
break;
}
if (gui.key_event_accepted)
break;
if (control->data.stop_mouse && (p_input.type==InputEvent::MOUSE_BUTTON || p_input.type==InputEvent::MOUSE_MOTION))