1 files changed, 38 insertions, 21 deletions

diff --git a/scene/2d/ray_cast_2d.cpp b/scene/2d/ray_cast_2d.cpp
index 50d437f78b..5020940c5c 100644
--- a/scene/2d/ray_cast_2d.cpp
+++ b/scene/2d/ray_cast_2d.cpp
@@ -37,8 +37,9 @@
 
 void RayCast2D::set_cast_to(const Vector2 &p_point) {
 	cast_to = p_point;
-	if (is_inside_tree() && (Engine::get_singleton()->is_editor_hint() || get_tree()->is_debugging_collisions_hint()))
+	if (is_inside_tree() && (Engine::get_singleton()->is_editor_hint() || get_tree()->is_debugging_collisions_hint())) {
 		update();
+	}
 }
 
 Vector2 RayCast2D::get_cast_to() const {
@@ -55,10 +56,11 @@ uint32_t RayCast2D::get_collision_mask() const {
 
 void RayCast2D::set_collision_mask_bit(int p_bit, bool p_value) {
 	uint32_t mask = get_collision_mask();
-	if (p_value)
+	if (p_value) {
 		mask |= 1 << p_bit;
-	else
+	} else {
 		mask &= ~(1 << p_bit);
+	}
 	set_collision_mask(mask);
 }
 
@@ -71,8 +73,9 @@ bool RayCast2D::is_colliding() const {
 }
 
 Object *RayCast2D::get_collider() const {
-	if (against.is_null())
+	if (against.is_null()) {
 		return nullptr;
+	}
 
 	return ObjectDB::get_instance(against);
 }
@@ -92,10 +95,12 @@ Vector2 RayCast2D::get_collision_normal() const {
 void RayCast2D::set_enabled(bool p_enabled) {
 	enabled = p_enabled;
 	update();
-	if (is_inside_tree() && !Engine::get_singleton()->is_editor_hint())
+	if (is_inside_tree() && !Engine::get_singleton()->is_editor_hint()) {
 		set_physics_process_internal(p_enabled);
-	if (!p_enabled)
+	}
+	if (!p_enabled) {
 		collided = false;
+	}
 }
 
 bool RayCast2D::is_enabled() const {
@@ -103,19 +108,22 @@ bool RayCast2D::is_enabled() const {
 }
 
 void RayCast2D::set_exclude_parent_body(bool p_exclude_parent_body) {
-	if (exclude_parent_body == p_exclude_parent_body)
+	if (exclude_parent_body == p_exclude_parent_body) {
 		return;
+	}
 
 	exclude_parent_body = p_exclude_parent_body;
 
-	if (!is_inside_tree())
+	if (!is_inside_tree()) {
 		return;
+	}
 
 	if (Object::cast_to<CollisionObject2D>(get_parent())) {
-		if (exclude_parent_body)
+		if (exclude_parent_body) {
 			exclude.insert(Object::cast_to<CollisionObject2D>(get_parent())->get_rid());
-		else
+		} else {
 			exclude.erase(Object::cast_to<CollisionObject2D>(get_parent())->get_rid());
+		}
 	}
 }
 
@@ -126,27 +134,31 @@ bool RayCast2D::get_exclude_parent_body() const {
 void RayCast2D::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_ENTER_TREE: {
-			if (enabled && !Engine::get_singleton()->is_editor_hint())
+			if (enabled && !Engine::get_singleton()->is_editor_hint()) {
 				set_physics_process_internal(true);
-			else
+			} else {
 				set_physics_process_internal(false);
+			}
 
 			if (Object::cast_to<CollisionObject2D>(get_parent())) {
-				if (exclude_parent_body)
+				if (exclude_parent_body) {
 					exclude.insert(Object::cast_to<CollisionObject2D>(get_parent())->get_rid());
-				else
+				} else {
 					exclude.erase(Object::cast_to<CollisionObject2D>(get_parent())->get_rid());
+				}
 			}
 		} break;
 		case NOTIFICATION_EXIT_TREE: {
-			if (enabled)
+			if (enabled) {
 				set_physics_process_internal(false);
+			}
 
 		} break;
 
 		case NOTIFICATION_DRAW: {
-			if (!Engine::get_singleton()->is_editor_hint() && !get_tree()->is_debugging_collisions_hint())
+			if (!Engine::get_singleton()->is_editor_hint() && !get_tree()->is_debugging_collisions_hint()) {
 				break;
+			}
 			Transform2D xf;
 			xf.rotate(cast_to.angle());
 			xf.translate(Vector2(cast_to.length(), 0));
@@ -166,16 +178,18 @@ void RayCast2D::_notification(int p_what) {
 			pts.push_back(xf.xform(Vector2(0, Math_SQRT12 * tsize)));
 			pts.push_back(xf.xform(Vector2(0, -Math_SQRT12 * tsize)));
 			Vector<Color> cols;
-			for (int i = 0; i < 3; i++)
+			for (int i = 0; i < 3; i++) {
 				cols.push_back(draw_col);
+			}
 
 			draw_primitive(pts, cols, Vector<Vector2>());
 
 		} break;
 
 		case NOTIFICATION_INTERNAL_PHYSICS_PROCESS: {
-			if (!enabled)
+			if (!enabled) {
 				break;
+			}
 
 			_update_raycast_state();
 
@@ -193,8 +207,9 @@ void RayCast2D::_update_raycast_state() {
 	Transform2D gt = get_global_transform();
 
 	Vector2 to = cast_to;
-	if (to == Vector2())
+	if (to == Vector2()) {
 		to = Vector2(0, 0.01);
+	}
 
 	PhysicsDirectSpaceState2D::RayResult rr;
 
@@ -222,8 +237,9 @@ void RayCast2D::add_exception_rid(const RID &p_rid) {
 void RayCast2D::add_exception(const Object *p_object) {
 	ERR_FAIL_NULL(p_object);
 	const CollisionObject2D *co = Object::cast_to<CollisionObject2D>(p_object);
-	if (!co)
+	if (!co) {
 		return;
+	}
 	add_exception_rid(co->get_rid());
 }
 
@@ -234,8 +250,9 @@ void RayCast2D::remove_exception_rid(const RID &p_rid) {
 void RayCast2D::remove_exception(const Object *p_object) {
 	ERR_FAIL_NULL(p_object);
 	const CollisionObject2D *co = Object::cast_to<CollisionObject2D>(p_object);
-	if (!co)
+	if (!co) {
 		return;
+	}
 	remove_exception_rid(co->get_rid());
 }