From 9791d2ef6db5fd407ebbbb7dff44fee6d599c2da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Tue, 7 Jun 2016 07:39:40 +0200
Subject: [PATCH] Fix indentation issues in last commits

Ping @reduz.

(cherry picked from commit 0729c852b4f459b9cb6350f564136e3e8aa6c2cf)
---
 scene/2d/canvas_item.cpp | 13 ++++++-------
 scene/main/viewport.cpp  | 41 ++++++++++++++++++++--------------------
 2 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/scene/2d/canvas_item.cpp b/scene/2d/canvas_item.cpp
index 0c5886f755a..17e5503a2d7 100644
--- a/scene/2d/canvas_item.cpp
+++ b/scene/2d/canvas_item.cpp
@@ -460,9 +460,9 @@ void CanvasItem::_enter_canvas() {
 
 		while(n) {
 
-            canvas_layer = n->cast_to<CanvasLayer>();
-            if (canvas_layer) {
-                break;
+			canvas_layer = n->cast_to<CanvasLayer>();
+			if (canvas_layer) {
+				break;
 			}
 			n=n->get_parent();
 		}
@@ -471,7 +471,7 @@ void CanvasItem::_enter_canvas() {
 		if (canvas_layer)
 			canvas=canvas_layer->get_world_2d()->get_canvas();
 		else
-            canvas=get_viewport()->find_world_2d()->get_canvas();
+			canvas=get_viewport()->find_world_2d()->get_canvas();
 
 		VisualServer::get_singleton()->canvas_item_set_parent(canvas_item,canvas);
 
@@ -482,9 +482,8 @@ void CanvasItem::_enter_canvas() {
 
 	} else {
 
-
 		CanvasItem *parent = get_parent_item();
-        canvas_layer=parent->canvas_layer;
+		canvas_layer=parent->canvas_layer;
 		VisualServer::get_singleton()->canvas_item_set_parent(canvas_item,parent->get_canvas_item());
 		parent->_queue_sort_children();
 	}
@@ -1173,7 +1172,7 @@ Matrix32 CanvasItem::get_viewport_transform() const {
 			return canvas_layer->get_transform();
 		}
 
-    } else {
+	} else {
 		return get_viewport()->get_final_transform() * get_viewport()->get_canvas_transform();
 	}
 
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp
index 2c0afeec2a3..c4d27602048 100644
--- a/scene/main/viewport.cpp
+++ b/scene/main/viewport.cpp
@@ -1481,30 +1481,29 @@ void Viewport::_gui_call_input(Control *p_control,const InputEvent& p_input) {
 
 //	_block();
 
-    CanvasItem *ci=p_control;
-    while(ci) {
+	CanvasItem *ci=p_control;
+	while(ci) {
 
-        Control *control = ci->cast_to<Control>();
-        if (control) {
-            control->call_multilevel(SceneStringNames::get_singleton()->_input_event,p_input);
-            if (gui.key_event_accepted)
-                break;
-            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()) {
-                break;
-            }
-            if (gui.key_event_accepted)
-                break;
-            if (control->data.stop_mouse && (p_input.type==InputEvent::MOUSE_BUTTON || p_input.type==InputEvent::MOUSE_MOTION))
-                break;
-        }
+		Control *control = ci->cast_to<Control>();
+		if (control) {
+			control->call_multilevel(SceneStringNames::get_singleton()->_input_event,p_input);
+			if (gui.key_event_accepted)
+				break;
+			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())
+				break;
+			if (gui.key_event_accepted)
+				break;
+			if (control->data.stop_mouse && (p_input.type==InputEvent::MOUSE_BUTTON || p_input.type==InputEvent::MOUSE_MOTION))
+				break;
+		}
 
-        if (ci->is_set_as_toplevel())
-            break;
+		if (ci->is_set_as_toplevel())
+			break;
 
-        ci=ci->get_parent_item();
+		ci=ci->get_parent_item();
 	}
 
 	//_unblock();