1 files changed, 0 insertions, 104 deletions

diff --git a/scene/main/canvas_item.cpp b/scene/main/canvas_item.cpp
index e91826d44b..8ca33eaf96 100644
--- a/scene/main/canvas_item.cpp
+++ b/scene/main/canvas_item.cpp
@@ -48,7 +48,6 @@ Map<CanvasItemMaterial::MaterialKey, CanvasItemMaterial::ShaderData> CanvasItemM
 CanvasItemMaterial::ShaderNames *CanvasItemMaterial::shader_names = nullptr;
 
 void CanvasItemMaterial::init_shaders() {
-
 	dirty_materials = memnew(SelfList<CanvasItemMaterial>::List);
 
 	shader_names = memnew(ShaderNames);
@@ -59,14 +58,12 @@ void CanvasItemMaterial::init_shaders() {
 }
 
 void CanvasItemMaterial::finish_shaders() {
-
 	memdelete(dirty_materials);
 	memdelete(shader_names);
 	dirty_materials = nullptr;
 }
 
 void CanvasItemMaterial::_update_shader() {
-
 	dirty_materials->remove(&element);
 
 	MaterialKey mk = _compute_key();
@@ -85,7 +82,6 @@ void CanvasItemMaterial::_update_shader() {
 	current_key = mk;
 
 	if (shader_map.has(mk)) {
-
 		RS::get_singleton()->material_set_shader(_get_material(), shader_map[mk].shader);
 		shader_map[mk].users++;
 		return;
@@ -129,7 +125,6 @@ void CanvasItemMaterial::_update_shader() {
 	code += ";\n";
 
 	if (particles_animation) {
-
 		code += "uniform int particles_anim_h_frames;\n";
 		code += "uniform int particles_anim_v_frames;\n";
 		code += "uniform bool particles_anim_loop;\n";
@@ -165,17 +160,14 @@ void CanvasItemMaterial::_update_shader() {
 }
 
 void CanvasItemMaterial::flush_changes() {
-
 	MutexLock lock(material_mutex);
 
 	while (dirty_materials->first()) {
-
 		dirty_materials->first()->self()->_update_shader();
 	}
 }
 
 void CanvasItemMaterial::_queue_shader_change() {
-
 	MutexLock lock(material_mutex);
 
 	if (!element.in_list()) {
@@ -184,13 +176,11 @@ void CanvasItemMaterial::_queue_shader_change() {
 }
 
 bool CanvasItemMaterial::_is_shader_dirty() const {
-
 	MutexLock lock(material_mutex);
 
 	return element.in_list();
 }
 void CanvasItemMaterial::set_blend_mode(BlendMode p_blend_mode) {
-
 	blend_mode = p_blend_mode;
 	_queue_shader_change();
 }
@@ -200,13 +190,11 @@ CanvasItemMaterial::BlendMode CanvasItemMaterial::get_blend_mode() const {
 }
 
 void CanvasItemMaterial::set_light_mode(LightMode p_light_mode) {
-
 	light_mode = p_light_mode;
 	_queue_shader_change();
 }
 
 CanvasItemMaterial::LightMode CanvasItemMaterial::get_light_mode() const {
-
 	return light_mode;
 }
 
@@ -221,34 +209,28 @@ bool CanvasItemMaterial::get_particles_animation() const {
 }
 
 void CanvasItemMaterial::set_particles_anim_h_frames(int p_frames) {
-
 	particles_anim_h_frames = p_frames;
 	RS::get_singleton()->material_set_param(_get_material(), shader_names->particles_anim_h_frames, p_frames);
 }
 
 int CanvasItemMaterial::get_particles_anim_h_frames() const {
-
 	return particles_anim_h_frames;
 }
 void CanvasItemMaterial::set_particles_anim_v_frames(int p_frames) {
-
 	particles_anim_v_frames = p_frames;
 	RS::get_singleton()->material_set_param(_get_material(), shader_names->particles_anim_v_frames, p_frames);
 }
 
 int CanvasItemMaterial::get_particles_anim_v_frames() const {
-
 	return particles_anim_v_frames;
 }
 
 void CanvasItemMaterial::set_particles_anim_loop(bool p_loop) {
-
 	particles_anim_loop = p_loop;
 	RS::get_singleton()->material_set_param(_get_material(), shader_names->particles_anim_loop, particles_anim_loop);
 }
 
 bool CanvasItemMaterial::get_particles_anim_loop() const {
-
 	return particles_anim_loop;
 }
 
@@ -259,18 +241,15 @@ void CanvasItemMaterial::_validate_property(PropertyInfo &property) const {
 }
 
 RID CanvasItemMaterial::get_shader_rid() const {
-
 	ERR_FAIL_COND_V(!shader_map.has(current_key), RID());
 	return shader_map[current_key].shader;
 }
 
 Shader::Mode CanvasItemMaterial::get_shader_mode() const {
-
 	return Shader::MODE_CANVAS_ITEM;
 }
 
 void CanvasItemMaterial::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("set_blend_mode", "blend_mode"), &CanvasItemMaterial::set_blend_mode);
 	ClassDB::bind_method(D_METHOD("get_blend_mode"), &CanvasItemMaterial::get_blend_mode);
 
@@ -310,7 +289,6 @@ void CanvasItemMaterial::_bind_methods() {
 
 CanvasItemMaterial::CanvasItemMaterial() :
 		element(this) {
-
 	blend_mode = BLEND_MODE_MIX;
 	light_mode = LIGHT_MODE_NORMAL;
 	particles_animation = false;
@@ -325,7 +303,6 @@ CanvasItemMaterial::CanvasItemMaterial() :
 }
 
 CanvasItemMaterial::~CanvasItemMaterial() {
-
 	MutexLock lock(material_mutex);
 
 	if (shader_map.has(current_key)) {
@@ -356,7 +333,6 @@ Transform2D CanvasItem::_edit_get_transform() const {
 #endif
 
 bool CanvasItem::is_visible_in_tree() const {
-
 	if (!is_inside_tree())
 		return false;
 
@@ -375,7 +351,6 @@ bool CanvasItem::is_visible_in_tree() const {
 }
 
 void CanvasItem::_propagate_visibility_changed(bool p_visible) {
-
 	if (p_visible && first_draw) { //avoid propagating it twice
 		first_draw = false;
 	}
@@ -388,7 +363,6 @@ void CanvasItem::_propagate_visibility_changed(bool p_visible) {
 	_block();
 
 	for (int i = 0; i < get_child_count(); i++) {
-
 		CanvasItem *c = Object::cast_to<CanvasItem>(get_child(i));
 
 		if (c && c->visible) //should the toplevels stop propagation? i think so but..
@@ -399,7 +373,6 @@ void CanvasItem::_propagate_visibility_changed(bool p_visible) {
 }
 
 void CanvasItem::show() {
-
 	if (visible)
 		return;
 
@@ -414,7 +387,6 @@ void CanvasItem::show() {
 }
 
 void CanvasItem::hide() {
-
 	if (!visible)
 		return;
 
@@ -434,7 +406,6 @@ CanvasItem *CanvasItem::get_current_item_drawn() {
 }
 
 void CanvasItem::_update_callback() {
-
 	if (!is_inside_tree()) {
 		pending_update = false;
 		return;
@@ -462,7 +433,6 @@ void CanvasItem::_update_callback() {
 }
 
 Transform2D CanvasItem::get_global_transform_with_canvas() const {
-
 	if (canvas_layer)
 		return canvas_layer->get_transform() * get_global_transform();
 	else if (is_inside_tree())
@@ -491,7 +461,6 @@ Transform2D CanvasItem::get_global_transform() const {
 	ERR_FAIL_COND_V(!is_inside_tree(), get_transform());
 #endif
 	if (global_invalid) {
-
 		const CanvasItem *pi = get_parent_item();
 		if (pi)
 			global_transform = pi->get_global_transform() * get_transform();
@@ -505,7 +474,6 @@ Transform2D CanvasItem::get_global_transform() const {
 }
 
 void CanvasItem::_toplevel_raise_self() {
-
 	if (!is_inside_tree())
 		return;
 
@@ -516,15 +484,12 @@ void CanvasItem::_toplevel_raise_self() {
 }
 
 void CanvasItem::_enter_canvas() {
-
 	if ((!Object::cast_to<CanvasItem>(get_parent())) || toplevel) {
-
 		Node *n = this;
 
 		canvas_layer = nullptr;
 
 		while (n) {
-
 			canvas_layer = Object::cast_to<CanvasLayer>(n);
 			if (canvas_layer) {
 				break;
@@ -554,7 +519,6 @@ void CanvasItem::_enter_canvas() {
 		get_tree()->call_group_flags(SceneTree::GROUP_CALL_UNIQUE, group, "_toplevel_raise_self");
 
 	} else {
-
 		CanvasItem *parent = get_parent_item();
 		canvas_layer = parent->canvas_layer;
 		RenderingServer::get_singleton()->canvas_item_set_parent(canvas_item, parent->get_canvas_item());
@@ -568,7 +532,6 @@ void CanvasItem::_enter_canvas() {
 }
 
 void CanvasItem::_exit_canvas() {
-
 	notification(NOTIFICATION_EXIT_CANVAS, true); //reverse the notification
 	RenderingServer::get_singleton()->canvas_item_set_parent(canvas_item, RID());
 	canvas_layer = nullptr;
@@ -576,10 +539,8 @@ void CanvasItem::_exit_canvas() {
 }
 
 void CanvasItem::_notification(int p_what) {
-
 	switch (p_what) {
 		case NOTIFICATION_ENTER_TREE: {
-
 			_update_texture_filter_changed(false);
 			_update_texture_repeat_changed(false);
 
@@ -615,7 +576,6 @@ void CanvasItem::_notification(int p_what) {
 			}
 		} break;
 		case NOTIFICATION_MOVED_IN_PARENT: {
-
 			if (!is_inside_tree())
 				break;
 
@@ -643,17 +603,14 @@ void CanvasItem::_notification(int p_what) {
 		} break;
 		case NOTIFICATION_DRAW:
 		case NOTIFICATION_TRANSFORM_CHANGED: {
-
 		} break;
 		case NOTIFICATION_VISIBILITY_CHANGED: {
-
 			emit_signal(SceneStringNames::get_singleton()->visibility_changed);
 		} break;
 	}
 }
 
 void CanvasItem::set_visible(bool p_visible) {
-
 	if (p_visible)
 		show();
 	else
@@ -661,19 +618,16 @@ void CanvasItem::set_visible(bool p_visible) {
 }
 
 void CanvasItem::_window_visibility_changed() {
-
 	if (visible) {
 		_propagate_visibility_changed(window->is_visible());
 	}
 }
 
 bool CanvasItem::is_visible() const {
-
 	return visible;
 }
 
 void CanvasItem::update() {
-
 	if (!is_inside_tree())
 		return;
 	if (pending_update)
@@ -685,7 +639,6 @@ void CanvasItem::update() {
 }
 
 void CanvasItem::set_modulate(const Color &p_modulate) {
-
 	if (modulate == p_modulate)
 		return;
 
@@ -693,12 +646,10 @@ void CanvasItem::set_modulate(const Color &p_modulate) {
 	RenderingServer::get_singleton()->canvas_item_set_modulate(canvas_item, modulate);
 }
 Color CanvasItem::get_modulate() const {
-
 	return modulate;
 }
 
 void CanvasItem::set_as_toplevel(bool p_toplevel) {
-
 	if (toplevel == p_toplevel)
 		return;
 
@@ -713,12 +664,10 @@ void CanvasItem::set_as_toplevel(bool p_toplevel) {
 }
 
 bool CanvasItem::is_set_as_toplevel() const {
-
 	return toplevel;
 }
 
 CanvasItem *CanvasItem::get_parent_item() const {
-
 	if (toplevel)
 		return nullptr;
 
@@ -726,7 +675,6 @@ CanvasItem *CanvasItem::get_parent_item() const {
 }
 
 void CanvasItem::set_self_modulate(const Color &p_self_modulate) {
-
 	if (self_modulate == p_self_modulate)
 		return;
 
@@ -734,12 +682,10 @@ void CanvasItem::set_self_modulate(const Color &p_self_modulate) {
 	RenderingServer::get_singleton()->canvas_item_set_self_modulate(canvas_item, self_modulate);
 }
 Color CanvasItem::get_self_modulate() const {
-
 	return self_modulate;
 }
 
 void CanvasItem::set_light_mask(int p_light_mask) {
-
 	if (light_mask == p_light_mask)
 		return;
 
@@ -748,26 +694,22 @@ void CanvasItem::set_light_mask(int p_light_mask) {
 }
 
 int CanvasItem::get_light_mask() const {
-
 	return light_mask;
 }
 
 void CanvasItem::item_rect_changed(bool p_size_changed) {
-
 	if (p_size_changed)
 		update();
 	emit_signal(SceneStringNames::get_singleton()->item_rect_changed);
 }
 
 void CanvasItem::draw_line(const Point2 &p_from, const Point2 &p_to, const Color &p_color, float p_width) {
-
 	ERR_FAIL_COND_MSG(!drawing, "Drawing is only allowed inside NOTIFICATION_DRAW, _draw() function or 'draw' signal.");
 
 	RenderingServer::get_singleton()->canvas_item_add_line(canvas_item, p_from, p_to, p_color, p_width);
 }
 
 void CanvasItem::draw_polyline(const Vector<Point2> &p_points, const Color &p_color, float p_width) {
-
 	ERR_FAIL_COND_MSG(!drawing, "Drawing is only allowed inside NOTIFICATION_DRAW, _draw() function or 'draw' signal.");
 
 	Vector<Color> colors;
@@ -776,14 +718,12 @@ void CanvasItem::draw_polyline(const Vector<Point2> &p_points, const Color &p_co
 }
 
 void CanvasItem::draw_polyline_colors(const Vector<Point2> &p_points, const Vector<Color> &p_colors, float p_width) {
-
 	ERR_FAIL_COND_MSG(!drawing, "Drawing is only allowed inside NOTIFICATION_DRAW, _draw() function or 'draw' signal.");
 
 	RenderingServer::get_singleton()->canvas_item_add_polyline(canvas_item, p_points, p_colors, p_width);
 }
 
 void CanvasItem::draw_arc(const Vector2 &p_center, float p_radius, float p_start_angle, float p_end_angle, int p_point_count, const Color &p_color, float p_width) {
-
 	Vector<Point2> points;
 	points.resize(p_point_count);
 	const float delta_angle = p_end_angle - p_start_angle;
@@ -796,7 +736,6 @@ void CanvasItem::draw_arc(const Vector2 &p_center, float p_radius, float p_start
 }
 
 void CanvasItem::draw_multiline(const Vector<Point2> &p_points, const Color &p_color, float p_width) {
-
 	ERR_FAIL_COND_MSG(!drawing, "Drawing is only allowed inside NOTIFICATION_DRAW, _draw() function or 'draw' signal.");
 
 	Vector<Color> colors;
@@ -805,14 +744,12 @@ void CanvasItem::draw_multiline(const Vector<Point2> &p_points, const Color &p_c
 }
 
 void CanvasItem::draw_multiline_colors(const Vector<Point2> &p_points, const Vector<Color> &p_colors, float p_width) {
-
 	ERR_FAIL_COND_MSG(!drawing, "Drawing is only allowed inside NOTIFICATION_DRAW, _draw() function or 'draw' signal.");
 
 	RenderingServer::get_singleton()->canvas_item_add_multiline(canvas_item, p_points, p_colors, p_width);
 }
 
 void CanvasItem::draw_rect(const Rect2 &p_rect, const Color &p_color, bool p_filled, float p_width) {
-
 	ERR_FAIL_COND_MSG(!drawing, "Drawing is only allowed inside NOTIFICATION_DRAW, _draw() function or 'draw' signal.");
 
 	if (p_filled) {
@@ -859,14 +796,12 @@ void CanvasItem::draw_rect(const Rect2 &p_rect, const Color &p_color, bool p_fil
 }
 
 void CanvasItem::draw_circle(const Point2 &p_pos, float p_radius, const Color &p_color) {
-
 	ERR_FAIL_COND_MSG(!drawing, "Drawing is only allowed inside NOTIFICATION_DRAW, _draw() function or 'draw' signal.");
 
 	RenderingServer::get_singleton()->canvas_item_add_circle(canvas_item, p_pos, p_radius, p_color);
 }
 
 void CanvasItem::draw_texture(const Ref<Texture2D> &p_texture, const Point2 &p_pos, const Color &p_modulate, const Ref<Texture2D> &p_normal_map, const Ref<Texture2D> &p_specular_map, const Color &p_specular_color_shininess, TextureFilter p_texture_filter, TextureRepeat p_texture_repeat) {
-
 	ERR_FAIL_COND_MSG(!drawing, "Drawing is only allowed inside NOTIFICATION_DRAW, _draw() function or 'draw' signal.");
 
 	ERR_FAIL_COND(p_texture.is_null());
@@ -875,14 +810,12 @@ void CanvasItem::draw_texture(const Ref<Texture2D> &p_texture, const Point2 &p_p
 }
 
 void CanvasItem::draw_texture_rect(const Ref<Texture2D> &p_texture, const Rect2 &p_rect, bool p_tile, const Color &p_modulate, bool p_transpose, const Ref<Texture2D> &p_normal_map, const Ref<Texture2D> &p_specular_map, const Color &p_specular_color_shininess, TextureFilter p_texture_filter, TextureRepeat p_texture_repeat) {
-
 	ERR_FAIL_COND_MSG(!drawing, "Drawing is only allowed inside NOTIFICATION_DRAW, _draw() function or 'draw' signal.");
 
 	ERR_FAIL_COND(p_texture.is_null());
 	p_texture->draw_rect(canvas_item, p_rect, p_tile, p_modulate, p_transpose, p_normal_map, p_specular_map, p_specular_color_shininess, RS::CanvasItemTextureFilter(p_texture_filter), RS::CanvasItemTextureRepeat(p_texture_repeat));
 }
 void CanvasItem::draw_texture_rect_region(const Ref<Texture2D> &p_texture, const Rect2 &p_rect, const Rect2 &p_src_rect, const Color &p_modulate, bool p_transpose, const Ref<Texture2D> &p_normal_map, const Ref<Texture2D> &p_specular_map, const Color &p_specular_color_shininess, bool p_clip_uv, TextureFilter p_texture_filter, TextureRepeat p_texture_repeat) {
-
 	ERR_FAIL_COND_MSG(!drawing, "Drawing is only allowed inside NOTIFICATION_DRAW, _draw() function or 'draw' signal.");
 	ERR_FAIL_COND(p_texture.is_null());
 	p_texture->draw_rect_region(canvas_item, p_rect, p_src_rect, p_modulate, p_transpose, p_normal_map, p_specular_map, p_specular_color_shininess, RS::CanvasItemTextureFilter(p_texture_filter), RS::CanvasItemTextureRepeat(p_texture_repeat), p_clip_uv);
@@ -896,7 +829,6 @@ void CanvasItem::draw_style_box(const Ref<StyleBox> &p_style_box, const Rect2 &p
 	p_style_box->draw(canvas_item, p_rect);
 }
 void CanvasItem::draw_primitive(const Vector<Point2> &p_points, const Vector<Color> &p_colors, const Vector<Point2> &p_uvs, Ref<Texture2D> p_texture, float p_width, const Ref<Texture2D> &p_normal_map, const Ref<Texture2D> &p_specular_map, const Color &p_specular_color_shininess, TextureFilter p_texture_filter, TextureRepeat p_texture_repeat) {
-
 	ERR_FAIL_COND_MSG(!drawing, "Drawing is only allowed inside NOTIFICATION_DRAW, _draw() function or 'draw' signal.");
 
 	RID rid = p_texture.is_valid() ? p_texture->get_rid() : RID();
@@ -906,7 +838,6 @@ void CanvasItem::draw_primitive(const Vector<Point2> &p_points, const Vector<Col
 	RenderingServer::get_singleton()->canvas_item_add_primitive(canvas_item, p_points, p_colors, p_uvs, rid, p_width, rid_normal, rid_specular, p_specular_color_shininess, RS::CanvasItemTextureFilter(p_texture_filter), RS::CanvasItemTextureRepeat(p_texture_repeat));
 }
 void CanvasItem::draw_set_transform(const Point2 &p_offset, float p_rot, const Size2 &p_scale) {
-
 	ERR_FAIL_COND_MSG(!drawing, "Drawing is only allowed inside NOTIFICATION_DRAW, _draw() function or 'draw' signal.");
 
 	Transform2D xform(p_rot, p_offset);
@@ -915,14 +846,12 @@ void CanvasItem::draw_set_transform(const Point2 &p_offset, float p_rot, const S
 }
 
 void CanvasItem::draw_set_transform_matrix(const Transform2D &p_matrix) {
-
 	ERR_FAIL_COND_MSG(!drawing, "Drawing is only allowed inside NOTIFICATION_DRAW, _draw() function or 'draw' signal.");
 
 	RenderingServer::get_singleton()->canvas_item_add_set_transform(canvas_item, p_matrix);
 }
 
 void CanvasItem::draw_polygon(const Vector<Point2> &p_points, const Vector<Color> &p_colors, const Vector<Point2> &p_uvs, Ref<Texture2D> p_texture, const Ref<Texture2D> &p_normal_map, const Ref<Texture2D> &p_specular_map, const Color &p_specular_color_shininess, TextureFilter p_texture_filter, TextureRepeat p_texture_repeat) {
-
 	ERR_FAIL_COND_MSG(!drawing, "Drawing is only allowed inside NOTIFICATION_DRAW, _draw() function or 'draw' signal.");
 
 	RID rid = p_texture.is_valid() ? p_texture->get_rid() : RID();
@@ -933,7 +862,6 @@ void CanvasItem::draw_polygon(const Vector<Point2> &p_points, const Vector<Color
 }
 
 void CanvasItem::draw_colored_polygon(const Vector<Point2> &p_points, const Color &p_color, const Vector<Point2> &p_uvs, Ref<Texture2D> p_texture, const Ref<Texture2D> &p_normal_map, const Ref<Texture2D> &p_specular_map, const Color &p_specular_color_shininess, TextureFilter p_texture_filter, TextureRepeat p_texture_repeat) {
-
 	ERR_FAIL_COND_MSG(!drawing, "Drawing is only allowed inside NOTIFICATION_DRAW, _draw() function or 'draw' signal.");
 
 	Vector<Color> colors;
@@ -946,7 +874,6 @@ void CanvasItem::draw_colored_polygon(const Vector<Point2> &p_points, const Colo
 }
 
 void CanvasItem::draw_mesh(const Ref<Mesh> &p_mesh, const Ref<Texture2D> &p_texture, const Ref<Texture2D> &p_normal_map, const Ref<Texture2D> &p_specular_map, const Color &p_specular_color_shininess, const Transform2D &p_transform, const Color &p_modulate, TextureFilter p_texture_filter, TextureRepeat p_texture_repeat) {
-
 	ERR_FAIL_COND(p_mesh.is_null());
 	RID texture_rid = p_texture.is_valid() ? p_texture->get_rid() : RID();
 	RID normal_map_rid = p_normal_map.is_valid() ? p_normal_map->get_rid() : RID();
@@ -955,7 +882,6 @@ void CanvasItem::draw_mesh(const Ref<Mesh> &p_mesh, const Ref<Texture2D> &p_text
 	RenderingServer::get_singleton()->canvas_item_add_mesh(canvas_item, p_mesh->get_rid(), p_transform, p_modulate, texture_rid, normal_map_rid, specular_map_rid, p_specular_color_shininess, RS::CanvasItemTextureFilter(p_texture_filter), RS::CanvasItemTextureRepeat(p_texture_repeat));
 }
 void CanvasItem::draw_multimesh(const Ref<MultiMesh> &p_multimesh, const Ref<Texture2D> &p_texture, const Ref<Texture2D> &p_normal_map, const Ref<Texture2D> &p_specular_map, const Color &p_specular_color_shininess, TextureFilter p_texture_filter, TextureRepeat p_texture_repeat) {
-
 	ERR_FAIL_COND(p_multimesh.is_null());
 	RID texture_rid = p_texture.is_valid() ? p_texture->get_rid() : RID();
 	RID normal_map_rid = p_normal_map.is_valid() ? p_normal_map->get_rid() : RID();
@@ -965,7 +891,6 @@ void CanvasItem::draw_multimesh(const Ref<MultiMesh> &p_multimesh, const Ref<Tex
 }
 
 void CanvasItem::draw_string(const Ref<Font> &p_font, const Point2 &p_pos, const String &p_text, const Color &p_modulate, int p_clip_w) {
-
 	ERR_FAIL_COND_MSG(!drawing, "Drawing is only allowed inside NOTIFICATION_DRAW, _draw() function or 'draw' signal.");
 
 	ERR_FAIL_COND(p_font.is_null());
@@ -973,7 +898,6 @@ void CanvasItem::draw_string(const Ref<Font> &p_font, const Point2 &p_pos, const
 }
 
 float CanvasItem::draw_char(const Ref<Font> &p_font, const Point2 &p_pos, const String &p_char, const String &p_next, const Color &p_modulate) {
-
 	ERR_FAIL_COND_V_MSG(!drawing, 0, "Drawing is only allowed inside NOTIFICATION_DRAW, _draw() function or 'draw' signal.");
 
 	ERR_FAIL_COND_V(p_char.length() != 1, 0);
@@ -986,7 +910,6 @@ float CanvasItem::draw_char(const Ref<Font> &p_font, const Point2 &p_pos, const
 }
 
 void CanvasItem::_notify_transform(CanvasItem *p_node) {
-
 	/* This check exists to avoid re-propagating the transform
 	 * notification down the tree on dirty nodes. It provides
 	 * optimization by avoiding redundancy (nodes are dirty, will get the
@@ -1007,7 +930,6 @@ void CanvasItem::_notify_transform(CanvasItem *p_node) {
 	}
 
 	for (List<CanvasItem *>::Element *E = p_node->children_items.front(); E; E = E->next()) {
-
 		CanvasItem *ci = E->get();
 		if (ci->toplevel)
 			continue;
@@ -1016,13 +938,11 @@ void CanvasItem::_notify_transform(CanvasItem *p_node) {
 }
 
 Rect2 CanvasItem::get_viewport_rect() const {
-
 	ERR_FAIL_COND_V(!is_inside_tree(), Rect2());
 	return get_viewport()->get_visible_rect();
 }
 
 RID CanvasItem::get_canvas() const {
-
 	ERR_FAIL_COND_V(!is_inside_tree(), RID());
 
 	if (canvas_layer)
@@ -1032,7 +952,6 @@ RID CanvasItem::get_canvas() const {
 }
 
 ObjectID CanvasItem::get_canvas_layer_instance_id() const {
-
 	if (canvas_layer) {
 		return canvas_layer->get_instance_id();
 	} else {
@@ -1041,7 +960,6 @@ ObjectID CanvasItem::get_canvas_layer_instance_id() const {
 }
 
 CanvasItem *CanvasItem::get_toplevel() const {
-
 	CanvasItem *ci = const_cast<CanvasItem *>(this);
 	while (!ci->toplevel && Object::cast_to<CanvasItem>(ci->get_parent())) {
 		ci = Object::cast_to<CanvasItem>(ci->get_parent());
@@ -1051,7 +969,6 @@ CanvasItem *CanvasItem::get_toplevel() const {
 }
 
 Ref<World2D> CanvasItem::get_world_2d() const {
-
 	ERR_FAIL_COND_V(!is_inside_tree(), Ref<World2D>());
 
 	CanvasItem *tl = get_toplevel();
@@ -1064,7 +981,6 @@ Ref<World2D> CanvasItem::get_world_2d() const {
 }
 
 RID CanvasItem::get_viewport_rid() const {
-
 	ERR_FAIL_COND_V(!is_inside_tree(), RID());
 	return get_viewport()->get_viewport_rid();
 }
@@ -1074,12 +990,10 @@ void CanvasItem::set_block_transform_notify(bool p_enable) {
 }
 
 bool CanvasItem::is_block_transform_notify_enabled() const {
-
 	return block_transform_notify;
 }
 
 void CanvasItem::set_draw_behind_parent(bool p_enable) {
-
 	if (behind == p_enable)
 		return;
 	behind = p_enable;
@@ -1087,12 +1001,10 @@ void CanvasItem::set_draw_behind_parent(bool p_enable) {
 }
 
 bool CanvasItem::is_draw_behind_parent_enabled() const {
-
 	return behind;
 }
 
 void CanvasItem::set_material(const Ref<Material> &p_material) {
-
 	material = p_material;
 	RID rid;
 	if (material.is_valid())
@@ -1102,23 +1014,19 @@ void CanvasItem::set_material(const Ref<Material> &p_material) {
 }
 
 void CanvasItem::set_use_parent_material(bool p_use_parent_material) {
-
 	use_parent_material = p_use_parent_material;
 	RS::get_singleton()->canvas_item_set_use_parent_material(canvas_item, p_use_parent_material);
 }
 
 bool CanvasItem::get_use_parent_material() const {
-
 	return use_parent_material;
 }
 
 Ref<Material> CanvasItem::get_material() const {
-
 	return material;
 }
 
 Vector2 CanvasItem::make_canvas_position_local(const Vector2 &screen_point) const {
-
 	ERR_FAIL_COND_V(!is_inside_tree(), screen_point);
 
 	Transform2D local_matrix = (get_canvas_transform() * get_global_transform()).affine_inverse();
@@ -1127,7 +1035,6 @@ Vector2 CanvasItem::make_canvas_position_local(const Vector2 &screen_point) cons
 }
 
 Ref<InputEvent> CanvasItem::make_input_local(const Ref<InputEvent> &p_event) const {
-
 	ERR_FAIL_COND_V(p_event.is_null(), p_event);
 	ERR_FAIL_COND_V(!is_inside_tree(), p_event);
 
@@ -1135,13 +1042,11 @@ Ref<InputEvent> CanvasItem::make_input_local(const Ref<InputEvent> &p_event) con
 }
 
 Vector2 CanvasItem::get_global_mouse_position() const {
-
 	ERR_FAIL_COND_V(!get_viewport(), Vector2());
 	return get_canvas_transform().affine_inverse().xform(get_viewport()->get_mouse_position());
 }
 
 Vector2 CanvasItem::get_local_mouse_position() const {
-
 	ERR_FAIL_COND_V(!get_viewport(), Vector2());
 
 	return get_global_transform().affine_inverse().xform(get_global_mouse_position());
@@ -1159,7 +1064,6 @@ void CanvasItem::force_update_transform() {
 }
 
 void CanvasItem::_bind_methods() {
-
 	ClassDB::bind_method(D_METHOD("_toplevel_raise_self"), &CanvasItem::_toplevel_raise_self);
 	ClassDB::bind_method(D_METHOD("_update_callback"), &CanvasItem::_update_callback);
 
@@ -1316,7 +1220,6 @@ void CanvasItem::_bind_methods() {
 }
 
 Transform2D CanvasItem::get_canvas_transform() const {
-
 	ERR_FAIL_COND_V(!is_inside_tree(), Transform2D());
 
 	if (canvas_layer)
@@ -1328,11 +1231,9 @@ Transform2D CanvasItem::get_canvas_transform() const {
 }
 
 Transform2D CanvasItem::get_viewport_transform() const {
-
 	ERR_FAIL_COND_V(!is_inside_tree(), Transform2D());
 
 	if (canvas_layer) {
-
 		if (get_viewport()) {
 			return get_viewport()->get_final_transform() * canvas_layer->get_transform();
 		} else {
@@ -1369,7 +1270,6 @@ bool CanvasItem::is_transform_notification_enabled() const {
 }
 
 int CanvasItem::get_canvas_layer() const {
-
 	if (canvas_layer)
 		return canvas_layer->get_layer();
 	else
@@ -1377,7 +1277,6 @@ int CanvasItem::get_canvas_layer() const {
 }
 
 void CanvasItem::_update_texture_filter_changed(bool p_propagate) {
-
 	if (!is_inside_tree()) {
 		return;
 	}
@@ -1434,7 +1333,6 @@ CanvasItem::TextureFilter CanvasItem::get_texture_filter() const {
 }
 
 void CanvasItem::_update_texture_repeat_changed(bool p_propagate) {
-
 	if (!is_inside_tree()) {
 		return;
 	}
@@ -1488,7 +1386,6 @@ CanvasItem::TextureRepeat CanvasItem::get_texture_repeat() const {
 
 CanvasItem::CanvasItem() :
 		xform_change(this) {
-
 	window = nullptr;
 	canvas_item = RenderingServer::get_singleton()->canvas_item_create();
 	visible = true;
@@ -1515,6 +1412,5 @@ CanvasItem::CanvasItem() :
 }
 
 CanvasItem::~CanvasItem() {
-
 	RenderingServer::get_singleton()->free(canvas_item);
 }