1 files changed, 25 insertions, 43 deletions

diff --git a/scene/main/canvas_layer.cpp b/scene/main/canvas_layer.cpp
index c1caa943e3..46cfb968f8 100644
--- a/scene/main/canvas_layer.cpp
+++ b/scene/main/canvas_layer.cpp
@@ -32,40 +32,37 @@
 #include "viewport.h"
 
 void CanvasLayer::set_layer(int p_xform) {
-
 	layer = p_xform;
-	if (viewport.is_valid())
+	if (viewport.is_valid()) {
 		RenderingServer::get_singleton()->viewport_set_canvas_stacking(viewport, canvas, layer, get_index());
+	}
 }
 
 int CanvasLayer::get_layer() const {
-
 	return layer;
 }
 
 void CanvasLayer::set_transform(const Transform2D &p_xform) {
-
 	transform = p_xform;
 	locrotscale_dirty = true;
-	if (viewport.is_valid())
+	if (viewport.is_valid()) {
 		RenderingServer::get_singleton()->viewport_set_canvas_transform(viewport, canvas, transform);
+	}
 }
 
 Transform2D CanvasLayer::get_transform() const {
-
 	return transform;
 }
 
 void CanvasLayer::_update_xform() {
-
 	transform.set_rotation_and_scale(rot, scale);
 	transform.set_origin(ofs);
-	if (viewport.is_valid())
+	if (viewport.is_valid()) {
 		RenderingServer::get_singleton()->viewport_set_canvas_transform(viewport, canvas, transform);
+	}
 }
 
 void CanvasLayer::_update_locrotscale() {
-
 	ofs = transform.elements[2];
 	rot = transform.get_rotation();
 	scale = transform.get_scale();
@@ -73,74 +70,68 @@ void CanvasLayer::_update_locrotscale() {
 }
 
 void CanvasLayer::set_offset(const Vector2 &p_offset) {
-
-	if (locrotscale_dirty)
+	if (locrotscale_dirty) {
 		_update_locrotscale();
+	}
 
 	ofs = p_offset;
 	_update_xform();
 }
 
 Vector2 CanvasLayer::get_offset() const {
-
-	if (locrotscale_dirty)
+	if (locrotscale_dirty) {
 		const_cast<CanvasLayer *>(this)->_update_locrotscale();
+	}
 
 	return ofs;
 }
 
 void CanvasLayer::set_rotation(real_t p_radians) {
-
-	if (locrotscale_dirty)
+	if (locrotscale_dirty) {
 		_update_locrotscale();
+	}
 
 	rot = p_radians;
 	_update_xform();
 }
 
 real_t CanvasLayer::get_rotation() const {
-
-	if (locrotscale_dirty)
+	if (locrotscale_dirty) {
 		const_cast<CanvasLayer *>(this)->_update_locrotscale();
+	}
 
 	return rot;
 }
 
 void CanvasLayer::set_rotation_degrees(real_t p_degrees) {
-
 	set_rotation(Math::deg2rad(p_degrees));
 }
 
 real_t CanvasLayer::get_rotation_degrees() const {
-
 	return Math::rad2deg(get_rotation());
 }
 
 void CanvasLayer::set_scale(const Vector2 &p_scale) {
-
-	if (locrotscale_dirty)
+	if (locrotscale_dirty) {
 		_update_locrotscale();
+	}
 
 	scale = p_scale;
 	_update_xform();
 }
 
 Vector2 CanvasLayer::get_scale() const {
-
-	if (locrotscale_dirty)
+	if (locrotscale_dirty) {
 		const_cast<CanvasLayer *>(this)->_update_locrotscale();
+	}
 
 	return scale;
 }
 
 void CanvasLayer::_notification(int p_what) {
-
 	switch (p_what) {
-
 		case NOTIFICATION_ENTER_TREE: {
-
 			if (custom_viewport && ObjectDB::get_instance(custom_viewport_id)) {
-
 				vp = custom_viewport;
 			} else {
 				vp = Node::get_viewport();
@@ -157,7 +148,6 @@ void CanvasLayer::_notification(int p_what) {
 
 		} break;
 		case NOTIFICATION_EXIT_TREE: {
-
 			vp->_canvas_layer_remove(this);
 			RenderingServer::get_singleton()->viewport_remove_canvas(viewport, canvas);
 			viewport = RID();
@@ -165,25 +155,24 @@ void CanvasLayer::_notification(int p_what) {
 
 		} break;
 		case NOTIFICATION_MOVED_IN_PARENT: {
-
-			if (is_inside_tree())
+			if (is_inside_tree()) {
 				RenderingServer::get_singleton()->viewport_set_canvas_stacking(viewport, canvas, layer, get_index());
+			}
 
 		} break;
 	}
 }
 
 Size2 CanvasLayer::get_viewport_size() const {
-
-	if (!is_inside_tree())
+	if (!is_inside_tree()) {
 		return Size2(1, 1);
+	}
 
 	Rect2 r = vp->get_visible_rect();
 	return r.size;
 }
 
 RID CanvasLayer::get_viewport() const {
-
 	return viewport;
 }
 
@@ -204,11 +193,11 @@ void CanvasLayer::set_custom_viewport(Node *p_viewport) {
 	}
 
 	if (is_inside_tree()) {
-
-		if (custom_viewport)
+		if (custom_viewport) {
 			vp = custom_viewport;
-		else
+		} else {
 			vp = Node::get_viewport();
+		}
 
 		vp->_canvas_layer_add(this);
 		viewport = vp->get_viewport_rid();
@@ -220,7 +209,6 @@ void CanvasLayer::set_custom_viewport(Node *p_viewport) {
 }
 
 Node *CanvasLayer::get_custom_viewport() const {
-
 	return custom_viewport;
 }
 
@@ -229,12 +217,10 @@ void CanvasLayer::reset_sort_index() {
 }
 
 int CanvasLayer::get_sort_index() {
-
 	return sort_index++;
 }
 
 RID CanvasLayer::get_canvas() const {
-
 	return canvas;
 }
 
@@ -261,7 +247,6 @@ float CanvasLayer::get_follow_viewport_scale() const {
 }
 
 void CanvasLayer::_update_follow_viewport(bool p_force_exit) {
-
 	if (!is_inside_tree()) {
 		return;
 	}
@@ -273,7 +258,6 @@ void CanvasLayer::_update_follow_viewport(bool p_force_exit) {
 }
 
 void CanvasLayer::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("set_layer", "layer"), &CanvasLayer::set_layer);
 	ClassDB::bind_method(D_METHOD("get_layer"), &CanvasLayer::get_layer);
 
@@ -319,7 +303,6 @@ void CanvasLayer::_bind_methods() {
 }
 
 CanvasLayer::CanvasLayer() {
-
 	vp = nullptr;
 	scale = Vector2(1, 1);
 	rot = 0;
@@ -334,6 +317,5 @@ CanvasLayer::CanvasLayer() {
 }
 
 CanvasLayer::~CanvasLayer() {
-
 	RS::get_singleton()->free(canvas);
 }