Style: clang-format: Disable KeepEmptyLinesAtTheStartOfBlocks

Which means that reduz' beloved style which we all became used to
will now be changed automatically to remove the first empty line.

This makes us lean closer to 1TBS (the one true brace style) instead
of hybridating it with some Allman-inspired spacing.

There's still the case of braces around single-statement blocks that
needs to be addressed (but clang-format can't help with that, but
clang-tidy may if we agree about it).

Part of #33027.

1 files changed, 0 insertions, 159 deletions

diff --git a/core/io/resource_format_binary.cpp b/core/io/resource_format_binary.cpp
index 8ce17bcfbe..77fe331929 100644
--- a/core/io/resource_format_binary.cpp
+++ b/core/io/resource_format_binary.cpp
@@ -94,7 +94,6 @@ enum {
 };
 
 void ResourceLoaderBinary::_advance_padding(uint32_t p_len) {
-
 	uint32_t extra = 4 - (p_len % 4);
 	if (extra < 4) {
 		for (uint32_t i = 0; i < extra; i++)
@@ -103,7 +102,6 @@ void ResourceLoaderBinary::_advance_padding(uint32_t p_len) {
 }
 
 StringName ResourceLoaderBinary::_get_string() {
-
 	uint32_t id = f->get_32();
 	if (id & 0x80000000) {
 		uint32_t len = id & 0x7FFFFFFF;
@@ -122,42 +120,32 @@ StringName ResourceLoaderBinary::_get_string() {
 }
 
 Error ResourceLoaderBinary::parse_variant(Variant &r_v) {
-
 	uint32_t type = f->get_32();
 	print_bl("find property of type: " + itos(type));
 
 	switch (type) {
-
 		case VARIANT_NIL: {
-
 			r_v = Variant();
 		} break;
 		case VARIANT_BOOL: {
-
 			r_v = bool(f->get_32());
 		} break;
 		case VARIANT_INT: {
-
 			r_v = int(f->get_32());
 		} break;
 		case VARIANT_INT64: {
-
 			r_v = int64_t(f->get_64());
 		} break;
 		case VARIANT_FLOAT: {
-
 			r_v = f->get_real();
 		} break;
 		case VARIANT_DOUBLE: {
-
 			r_v = f->get_double();
 		} break;
 		case VARIANT_STRING: {
-
 			r_v = get_unicode_string();
 		} break;
 		case VARIANT_VECTOR2: {
-
 			Vector2 v;
 			v.x = f->get_real();
 			v.y = f->get_real();
@@ -165,7 +153,6 @@ Error ResourceLoaderBinary::parse_variant(Variant &r_v) {
 
 		} break;
 		case VARIANT_VECTOR2I: {
-
 			Vector2i v;
 			v.x = f->get_32();
 			v.y = f->get_32();
@@ -173,7 +160,6 @@ Error ResourceLoaderBinary::parse_variant(Variant &r_v) {
 
 		} break;
 		case VARIANT_RECT2: {
-
 			Rect2 v;
 			v.position.x = f->get_real();
 			v.position.y = f->get_real();
@@ -183,7 +169,6 @@ Error ResourceLoaderBinary::parse_variant(Variant &r_v) {
 
 		} break;
 		case VARIANT_RECT2I: {
-
 			Rect2i v;
 			v.position.x = f->get_32();
 			v.position.y = f->get_32();
@@ -193,7 +178,6 @@ Error ResourceLoaderBinary::parse_variant(Variant &r_v) {
 
 		} break;
 		case VARIANT_VECTOR3: {
-
 			Vector3 v;
 			v.x = f->get_real();
 			v.y = f->get_real();
@@ -201,7 +185,6 @@ Error ResourceLoaderBinary::parse_variant(Variant &r_v) {
 			r_v = v;
 		} break;
 		case VARIANT_VECTOR3I: {
-
 			Vector3i v;
 			v.x = f->get_32();
 			v.y = f->get_32();
@@ -209,7 +192,6 @@ Error ResourceLoaderBinary::parse_variant(Variant &r_v) {
 			r_v = v;
 		} break;
 		case VARIANT_PLANE: {
-
 			Plane v;
 			v.normal.x = f->get_real();
 			v.normal.y = f->get_real();
@@ -227,7 +209,6 @@ Error ResourceLoaderBinary::parse_variant(Variant &r_v) {
 
 		} break;
 		case VARIANT_AABB: {
-
 			AABB v;
 			v.position.x = f->get_real();
 			v.position.y = f->get_real();
@@ -239,7 +220,6 @@ Error ResourceLoaderBinary::parse_variant(Variant &r_v) {
 
 		} break;
 		case VARIANT_MATRIX32: {
-
 			Transform2D v;
 			v.elements[0].x = f->get_real();
 			v.elements[0].y = f->get_real();
@@ -251,7 +231,6 @@ Error ResourceLoaderBinary::parse_variant(Variant &r_v) {
 
 		} break;
 		case VARIANT_MATRIX3: {
-
 			Basis v;
 			v.elements[0].x = f->get_real();
 			v.elements[0].y = f->get_real();
@@ -266,7 +245,6 @@ Error ResourceLoaderBinary::parse_variant(Variant &r_v) {
 
 		} break;
 		case VARIANT_TRANSFORM: {
-
 			Transform v;
 			v.basis.elements[0].x = f->get_real();
 			v.basis.elements[0].y = f->get_real();
@@ -283,7 +261,6 @@ Error ResourceLoaderBinary::parse_variant(Variant &r_v) {
 			r_v = v;
 		} break;
 		case VARIANT_COLOR: {
-
 			Color v;
 			v.r = f->get_real();
 			v.g = f->get_real();
@@ -293,12 +270,10 @@ Error ResourceLoaderBinary::parse_variant(Variant &r_v) {
 
 		} break;
 		case VARIANT_STRING_NAME: {
-
 			r_v = StringName(get_unicode_string());
 		} break;
 
 		case VARIANT_NODE_PATH: {
-
 			Vector<StringName> names;
 			Vector<StringName> subnames;
 			bool absolute;
@@ -322,15 +297,12 @@ Error ResourceLoaderBinary::parse_variant(Variant &r_v) {
 
 		} break;
 		case VARIANT_RID: {
-
 			r_v = f->get_32();
 		} break;
 		case VARIANT_OBJECT: {
-
 			uint32_t objtype = f->get_32();
 
 			switch (objtype) {
-
 				case OBJECT_EMPTY: {
 					//do none
 
@@ -384,7 +356,6 @@ Error ResourceLoaderBinary::parse_variant(Variant &r_v) {
 						WARN_PRINT("Broken external resource! (index out of size)");
 						r_v = Variant();
 					} else {
-
 						if (external_resources[erindex].cache.is_null()) {
 							//cache not here yet, wait for it?
 							if (use_sub_threads) {
@@ -393,10 +364,8 @@ Error ResourceLoaderBinary::parse_variant(Variant &r_v) {
 
 								if (err != OK || external_resources[erindex].cache.is_null()) {
 									if (!ResourceLoader::get_abort_on_missing_resources()) {
-
 										ResourceLoader::notify_dependency_error(local_path, external_resources[erindex].path, external_resources[erindex].type);
 									} else {
-
 										error = ERR_FILE_MISSING_DEPENDENCIES;
 										ERR_FAIL_V_MSG(error, "Can't load dependency: " + external_resources[erindex].path + ".");
 									}
@@ -409,23 +378,19 @@ Error ResourceLoaderBinary::parse_variant(Variant &r_v) {
 
 				} break;
 				default: {
-
 					ERR_FAIL_V(ERR_FILE_CORRUPT);
 				} break;
 			}
 
 		} break;
 		case VARIANT_CALLABLE: {
-
 			r_v = Callable();
 		} break;
 		case VARIANT_SIGNAL: {
-
 			r_v = Signal();
 		} break;
 
 		case VARIANT_DICTIONARY: {
-
 			uint32_t len = f->get_32();
 			Dictionary d; //last bit means shared
 			len &= 0x7FFFFFFF;
@@ -441,7 +406,6 @@ Error ResourceLoaderBinary::parse_variant(Variant &r_v) {
 			r_v = d;
 		} break;
 		case VARIANT_ARRAY: {
-
 			uint32_t len = f->get_32();
 			Array a; //last bit means shared
 			len &= 0x7FFFFFFF;
@@ -456,7 +420,6 @@ Error ResourceLoaderBinary::parse_variant(Variant &r_v) {
 
 		} break;
 		case VARIANT_RAW_ARRAY: {
-
 			uint32_t len = f->get_32();
 
 			Vector<uint8_t> array;
@@ -469,7 +432,6 @@ Error ResourceLoaderBinary::parse_variant(Variant &r_v) {
 
 		} break;
 		case VARIANT_INT32_ARRAY: {
-
 			uint32_t len = f->get_32();
 
 			Vector<int32_t> array;
@@ -480,7 +442,6 @@ Error ResourceLoaderBinary::parse_variant(Variant &r_v) {
 			{
 				uint32_t *ptr = (uint32_t *)w.ptr();
 				for (int i = 0; i < len; i++) {
-
 					ptr[i] = BSWAP32(ptr[i]);
 				}
 			}
@@ -490,7 +451,6 @@ Error ResourceLoaderBinary::parse_variant(Variant &r_v) {
 			r_v = array;
 		} break;
 		case VARIANT_INT64_ARRAY: {
-
 			uint32_t len = f->get_32();
 
 			Vector<int64_t> array;
@@ -501,7 +461,6 @@ Error ResourceLoaderBinary::parse_variant(Variant &r_v) {
 			{
 				uint64_t *ptr = (uint64_t *)w.ptr();
 				for (int i = 0; i < len; i++) {
-
 					ptr[i] = BSWAP64(ptr[i]);
 				}
 			}
@@ -511,7 +470,6 @@ Error ResourceLoaderBinary::parse_variant(Variant &r_v) {
 			r_v = array;
 		} break;
 		case VARIANT_FLOAT32_ARRAY: {
-
 			uint32_t len = f->get_32();
 
 			Vector<float> array;
@@ -522,7 +480,6 @@ Error ResourceLoaderBinary::parse_variant(Variant &r_v) {
 			{
 				uint32_t *ptr = (uint32_t *)w.ptr();
 				for (int i = 0; i < len; i++) {
-
 					ptr[i] = BSWAP32(ptr[i]);
 				}
 			}
@@ -532,7 +489,6 @@ Error ResourceLoaderBinary::parse_variant(Variant &r_v) {
 			r_v = array;
 		} break;
 		case VARIANT_FLOAT64_ARRAY: {
-
 			uint32_t len = f->get_32();
 
 			Vector<double> array;
@@ -543,7 +499,6 @@ Error ResourceLoaderBinary::parse_variant(Variant &r_v) {
 			{
 				uint64_t *ptr = (uint64_t *)w.ptr();
 				for (int i = 0; i < len; i++) {
-
 					ptr[i] = BSWAP64(ptr[i]);
 				}
 			}
@@ -553,7 +508,6 @@ Error ResourceLoaderBinary::parse_variant(Variant &r_v) {
 			r_v = array;
 		} break;
 		case VARIANT_STRING_ARRAY: {
-
 			uint32_t len = f->get_32();
 			Vector<String> array;
 			array.resize(len);
@@ -565,7 +519,6 @@ Error ResourceLoaderBinary::parse_variant(Variant &r_v) {
 
 		} break;
 		case VARIANT_VECTOR2_ARRAY: {
-
 			uint32_t len = f->get_32();
 
 			Vector<Vector2> array;
@@ -577,7 +530,6 @@ Error ResourceLoaderBinary::parse_variant(Variant &r_v) {
 				{
 					uint32_t *ptr = (uint32_t *)w.ptr();
 					for (int i = 0; i < len * 2; i++) {
-
 						ptr[i] = BSWAP32(ptr[i]);
 					}
 				}
@@ -592,7 +544,6 @@ Error ResourceLoaderBinary::parse_variant(Variant &r_v) {
 
 		} break;
 		case VARIANT_VECTOR3_ARRAY: {
-
 			uint32_t len = f->get_32();
 
 			Vector<Vector3> array;
@@ -604,7 +555,6 @@ Error ResourceLoaderBinary::parse_variant(Variant &r_v) {
 				{
 					uint32_t *ptr = (uint32_t *)w.ptr();
 					for (int i = 0; i < len * 3; i++) {
-
 						ptr[i] = BSWAP32(ptr[i]);
 					}
 				}
@@ -619,7 +569,6 @@ Error ResourceLoaderBinary::parse_variant(Variant &r_v) {
 
 		} break;
 		case VARIANT_COLOR_ARRAY: {
-
 			uint32_t len = f->get_32();
 
 			Vector<Color> array;
@@ -631,7 +580,6 @@ Error ResourceLoaderBinary::parse_variant(Variant &r_v) {
 				{
 					uint32_t *ptr = (uint32_t *)w.ptr();
 					for (int i = 0; i < len * 4; i++) {
-
 						ptr[i] = BSWAP32(ptr[i]);
 					}
 				}
@@ -653,23 +601,19 @@ Error ResourceLoaderBinary::parse_variant(Variant &r_v) {
 }
 
 void ResourceLoaderBinary::set_local_path(const String &p_local_path) {
-
 	res_path = p_local_path;
 }
 
 Ref<Resource> ResourceLoaderBinary::get_resource() {
-
 	return resource;
 }
 Error ResourceLoaderBinary::load() {
-
 	if (error != OK)
 		return error;
 
 	int stage = 0;
 
 	for (int i = 0; i < external_resources.size(); i++) {
-
 		String path = external_resources[i].path;
 
 		if (remaps.has(path)) {
@@ -688,10 +632,8 @@ Error ResourceLoaderBinary::load() {
 
 			if (external_resources[i].cache.is_null()) {
 				if (!ResourceLoader::get_abort_on_missing_resources()) {
-
 					ResourceLoader::notify_dependency_error(local_path, path, external_resources[i].type);
 				} else {
-
 					error = ERR_FILE_MISSING_DEPENDENCIES;
 					ERR_FAIL_V_MSG(error, "Can't load dependency: " + path + ".");
 				}
@@ -701,10 +643,8 @@ Error ResourceLoaderBinary::load() {
 			Error err = ResourceLoader::load_threaded_request(path, external_resources[i].type, use_sub_threads, local_path);
 			if (err != OK) {
 				if (!ResourceLoader::get_abort_on_missing_resources()) {
-
 					ResourceLoader::notify_dependency_error(local_path, path, external_resources[i].type);
 				} else {
-
 					error = ERR_FILE_MISSING_DEPENDENCIES;
 					ERR_FAIL_V_MSG(error, "Can't load dependency: " + path + ".");
 				}
@@ -715,7 +655,6 @@ Error ResourceLoaderBinary::load() {
 	}
 
 	for (int i = 0; i < internal_resources.size(); i++) {
-
 		bool main = i == (internal_resources.size() - 1);
 
 		//maybe it is loaded already
@@ -723,7 +662,6 @@ Error ResourceLoaderBinary::load() {
 		int subindex = 0;
 
 		if (!main) {
-
 			path = internal_resources[i].path;
 
 			if (path.begins_with("local://")) {
@@ -733,7 +671,6 @@ Error ResourceLoaderBinary::load() {
 			}
 
 			if (!use_nocache) {
-
 				if (ResourceCache::has(path)) {
 					//already loaded, don't do anything
 					stage++;
@@ -742,7 +679,6 @@ Error ResourceLoaderBinary::load() {
 				}
 			}
 		} else {
-
 			if (!use_nocache && !ResourceCache::has(res_path))
 				path = res_path;
 		}
@@ -783,7 +719,6 @@ Error ResourceLoaderBinary::load() {
 		//set properties
 
 		for (int j = 0; j < pc; j++) {
-
 			StringName name = _get_string();
 
 			if (name == StringName()) {
@@ -811,7 +746,6 @@ Error ResourceLoaderBinary::load() {
 		resource_cache.push_back(res);
 
 		if (main) {
-
 			f->close();
 			resource = res;
 			resource->set_as_translation_remapped(translation_remapped);
@@ -824,19 +758,16 @@ Error ResourceLoaderBinary::load() {
 }
 
 void ResourceLoaderBinary::set_translation_remapped(bool p_remapped) {
-
 	translation_remapped = p_remapped;
 }
 
 static void save_ustring(FileAccess *f, const String &p_string) {
-
 	CharString utf8 = p_string.utf8();
 	f->store_32(utf8.length() + 1);
 	f->store_buffer((const uint8_t *)utf8.get_data(), utf8.length() + 1);
 }
 
 static String get_ustring(FileAccess *f) {
-
 	int len = f->get_32();
 	Vector<char> str_buf;
 	str_buf.resize(len);
@@ -847,7 +778,6 @@ static String get_ustring(FileAccess *f) {
 }
 
 String ResourceLoaderBinary::get_unicode_string() {
-
 	int len = f->get_32();
 	if (len > str_buf.size()) {
 		str_buf.resize(len);
@@ -861,13 +791,11 @@ String ResourceLoaderBinary::get_unicode_string() {
 }
 
 void ResourceLoaderBinary::get_dependencies(FileAccess *p_f, List<String> *p_dependencies, bool p_add_types) {
-
 	open(p_f);
 	if (error)
 		return;
 
 	for (int i = 0; i < external_resources.size(); i++) {
-
 		String dep = external_resources[i].path;
 
 		if (p_add_types && external_resources[i].type != String()) {
@@ -879,7 +807,6 @@ void ResourceLoaderBinary::get_dependencies(FileAccess *p_f, List<String> *p_dep
 }
 
 void ResourceLoaderBinary::open(FileAccess *p_f) {
-
 	error = OK;
 
 	f = p_f;
@@ -924,7 +851,6 @@ void ResourceLoaderBinary::open(FileAccess *p_f) {
 	print_bl("format: " + itos(ver_format));
 
 	if (ver_format > FORMAT_VERSION || ver_major > VERSION_MAJOR) {
-
 		f->close();
 		ERR_FAIL_MSG("File format '" + itos(FORMAT_VERSION) + "." + itos(ver_major) + "." + itos(ver_minor) + "' is too new! Please upgrade to a new engine version: " + local_path + ".");
 	}
@@ -940,7 +866,6 @@ void ResourceLoaderBinary::open(FileAccess *p_f) {
 	uint32_t string_table_size = f->get_32();
 	string_map.resize(string_table_size);
 	for (uint32_t i = 0; i < string_table_size; i++) {
-
 		StringName s = get_unicode_string();
 		string_map.write[i] = s;
 	}
@@ -949,7 +874,6 @@ void ResourceLoaderBinary::open(FileAccess *p_f) {
 
 	uint32_t ext_resources_size = f->get_32();
 	for (uint32_t i = 0; i < ext_resources_size; i++) {
-
 		ExtResource er;
 		er.type = get_unicode_string();
 
@@ -962,7 +886,6 @@ void ResourceLoaderBinary::open(FileAccess *p_f) {
 	uint32_t int_resources_size = f->get_32();
 
 	for (uint32_t i = 0; i < int_resources_size; i++) {
-
 		IntResource ir;
 		ir.path = get_unicode_string();
 		ir.offset = f->get_64();
@@ -972,7 +895,6 @@ void ResourceLoaderBinary::open(FileAccess *p_f) {
 	print_bl("int resources: " + itos(int_resources_size));
 
 	if (f->eof_reached()) {
-
 		error = ERR_FILE_CORRUPT;
 		f->close();
 		ERR_FAIL_MSG("Premature end of file (EOF): " + local_path + ".");
@@ -980,7 +902,6 @@ void ResourceLoaderBinary::open(FileAccess *p_f) {
 }
 
 String ResourceLoaderBinary::recognize(FileAccess *p_f) {
-
 	error = OK;
 
 	f = p_f;
@@ -1014,7 +935,6 @@ String ResourceLoaderBinary::recognize(FileAccess *p_f) {
 	uint32_t ver_format = f->get_32();
 
 	if (ver_format > FORMAT_VERSION || ver_major > VERSION_MAJOR) {
-
 		f->close();
 		return "";
 	}
@@ -1025,13 +945,11 @@ String ResourceLoaderBinary::recognize(FileAccess *p_f) {
 }
 
 ResourceLoaderBinary::~ResourceLoaderBinary() {
-
 	if (f)
 		memdelete(f);
 }
 
 RES ResourceFormatLoaderBinary::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, bool p_no_cache) {
-
 	if (r_error)
 		*r_error = ERR_FILE_CANT_OPEN;
 
@@ -1063,7 +981,6 @@ RES ResourceFormatLoaderBinary::load(const String &p_path, const String &p_origi
 }
 
 void ResourceFormatLoaderBinary::get_recognized_extensions_for_type(const String &p_type, List<String> *p_extensions) const {
-
 	if (p_type == "") {
 		get_recognized_extensions(p_extensions);
 		return;
@@ -1080,7 +997,6 @@ void ResourceFormatLoaderBinary::get_recognized_extensions_for_type(const String
 	}
 }
 void ResourceFormatLoaderBinary::get_recognized_extensions(List<String> *p_extensions) const {
-
 	List<String> extensions;
 	ClassDB::get_resource_base_extensions(&extensions);
 	extensions.sort();
@@ -1092,12 +1008,10 @@ void ResourceFormatLoaderBinary::get_recognized_extensions(List<String> *p_exten
 }
 
 bool ResourceFormatLoaderBinary::handles_type(const String &p_type) const {
-
 	return true; //handles all
 }
 
 void ResourceFormatLoaderBinary::get_dependencies(const String &p_path, List<String> *p_dependencies, bool p_add_types) {
-
 	FileAccess *f = FileAccess::open(p_path, FileAccess::READ);
 	ERR_FAIL_COND_MSG(!f, "Cannot open file '" + p_path + "'.");
 
@@ -1109,7 +1023,6 @@ void ResourceFormatLoaderBinary::get_dependencies(const String &p_path, List<Str
 }
 
 Error ResourceFormatLoaderBinary::rename_dependencies(const String &p_path, const Map<String, String> &p_map) {
-
 	//Error error=OK;
 
 	FileAccess *f = FileAccess::open(p_path, FileAccess::READ);
@@ -1175,7 +1088,6 @@ Error ResourceFormatLoaderBinary::rename_dependencies(const String &p_path, cons
 	uint32_t ver_format = f->get_32();
 
 	if (ver_format < FORMAT_VERSION_CAN_RENAME_DEPS) {
-
 		memdelete(f);
 		memdelete(fw);
 		DirAccess *da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
@@ -1207,7 +1119,6 @@ Error ResourceFormatLoaderBinary::rename_dependencies(const String &p_path, cons
 	}
 
 	if (ver_format > FORMAT_VERSION || ver_major > VERSION_MAJOR) {
-
 		memdelete(f);
 		memdelete(fw);
 		ERR_FAIL_V_MSG(ERR_FILE_UNRECOGNIZED, "File format '" + itos(FORMAT_VERSION) + "." + itos(ver_major) + "." + itos(ver_minor) + "' is too new! Please upgrade to a new engine version: " + local_path + ".");
@@ -1236,7 +1147,6 @@ Error ResourceFormatLoaderBinary::rename_dependencies(const String &p_path, cons
 	fw->store_32(string_table_size);
 
 	for (uint32_t i = 0; i < string_table_size; i++) {
-
 		String s = get_ustring(f);
 		save_ustring(fw, s);
 	}
@@ -1245,7 +1155,6 @@ Error ResourceFormatLoaderBinary::rename_dependencies(const String &p_path, cons
 	uint32_t ext_resources_size = f->get_32();
 	fw->store_32(ext_resources_size);
 	for (uint32_t i = 0; i < ext_resources_size; i++) {
-
 		String type = get_ustring(f);
 		String path = get_ustring(f);
 
@@ -1276,7 +1185,6 @@ Error ResourceFormatLoaderBinary::rename_dependencies(const String &p_path, cons
 	fw->store_32(int_resources_size);
 
 	for (uint32_t i = 0; i < int_resources_size; i++) {
-
 		String path = get_ustring(f);
 		uint64_t offset = f->get_64();
 		save_ustring(fw, path);
@@ -1310,7 +1218,6 @@ Error ResourceFormatLoaderBinary::rename_dependencies(const String &p_path, cons
 }
 
 String ResourceFormatLoaderBinary::get_resource_type(const String &p_path) const {
-
 	FileAccess *f = FileAccess::open(p_path, FileAccess::READ);
 	if (!f) {
 		return ""; //could not rwead
@@ -1329,7 +1236,6 @@ String ResourceFormatLoaderBinary::get_resource_type(const String &p_path) const
 ///////////////////////////////////////////////////////////
 
 void ResourceFormatSaverBinaryInstance::_pad_buffer(FileAccess *f, int p_bytes) {
-
 	int extra = 4 - (p_bytes % 4);
 	if (extra < 4) {
 		for (int i = 0; i < extra; i++)
@@ -1338,27 +1244,21 @@ void ResourceFormatSaverBinaryInstance::_pad_buffer(FileAccess *f, int p_bytes)
 }
 
 void ResourceFormatSaverBinaryInstance::_write_variant(const Variant &p_property, const PropertyInfo &p_hint) {
-
 	write_variant(f, p_property, resource_set, external_resources, string_map, p_hint);
 }
 
 void ResourceFormatSaverBinaryInstance::write_variant(FileAccess *f, const Variant &p_property, Set<RES> &resource_set, Map<RES, int> &external_resources, Map<StringName, int> &string_map, const PropertyInfo &p_hint) {
-
 	switch (p_property.get_type()) {
-
 		case Variant::NIL: {
-
 			f->store_32(VARIANT_NIL);
 			// don't store anything
 		} break;
 		case Variant::BOOL: {
-
 			f->store_32(VARIANT_BOOL);
 			bool val = p_property;
 			f->store_32(val);
 		} break;
 		case Variant::INT: {
-
 			int64_t val = p_property;
 			if (val > 0x7FFFFFFF || val < -(int64_t)0x80000000) {
 				f->store_32(VARIANT_INT64);
@@ -1371,28 +1271,24 @@ void ResourceFormatSaverBinaryInstance::write_variant(FileAccess *f, const Varia
 
 		} break;
 		case Variant::FLOAT: {
-
 			double d = p_property;
 			float fl = d;
 			if (double(fl) != d) {
 				f->store_32(VARIANT_DOUBLE);
 				f->store_double(d);
 			} else {
-
 				f->store_32(VARIANT_FLOAT);
 				f->store_real(fl);
 			}
 
 		} break;
 		case Variant::STRING: {
-
 			f->store_32(VARIANT_STRING);
 			String val = p_property;
 			save_unicode_string(f, val);
 
 		} break;
 		case Variant::VECTOR2: {
-
 			f->store_32(VARIANT_VECTOR2);
 			Vector2 val = p_property;
 			f->store_real(val.x);
@@ -1400,7 +1296,6 @@ void ResourceFormatSaverBinaryInstance::write_variant(FileAccess *f, const Varia
 
 		} break;
 		case Variant::VECTOR2I: {
-
 			f->store_32(VARIANT_VECTOR2I);
 			Vector2i val = p_property;
 			f->store_32(val.x);
@@ -1408,7 +1303,6 @@ void ResourceFormatSaverBinaryInstance::write_variant(FileAccess *f, const Varia
 
 		} break;
 		case Variant::RECT2: {
-
 			f->store_32(VARIANT_RECT2);
 			Rect2 val = p_property;
 			f->store_real(val.position.x);
@@ -1418,7 +1312,6 @@ void ResourceFormatSaverBinaryInstance::write_variant(FileAccess *f, const Varia
 
 		} break;
 		case Variant::RECT2I: {
-
 			f->store_32(VARIANT_RECT2I);
 			Rect2i val = p_property;
 			f->store_32(val.position.x);
@@ -1428,7 +1321,6 @@ void ResourceFormatSaverBinaryInstance::write_variant(FileAccess *f, const Varia
 
 		} break;
 		case Variant::VECTOR3: {
-
 			f->store_32(VARIANT_VECTOR3);
 			Vector3 val = p_property;
 			f->store_real(val.x);
@@ -1437,7 +1329,6 @@ void ResourceFormatSaverBinaryInstance::write_variant(FileAccess *f, const Varia
 
 		} break;
 		case Variant::VECTOR3I: {
-
 			f->store_32(VARIANT_VECTOR3I);
 			Vector3i val = p_property;
 			f->store_32(val.x);
@@ -1446,7 +1337,6 @@ void ResourceFormatSaverBinaryInstance::write_variant(FileAccess *f, const Varia
 
 		} break;
 		case Variant::PLANE: {
-
 			f->store_32(VARIANT_PLANE);
 			Plane val = p_property;
 			f->store_real(val.normal.x);
@@ -1456,7 +1346,6 @@ void ResourceFormatSaverBinaryInstance::write_variant(FileAccess *f, const Varia
 
 		} break;
 		case Variant::QUAT: {
-
 			f->store_32(VARIANT_QUAT);
 			Quat val = p_property;
 			f->store_real(val.x);
@@ -1466,7 +1355,6 @@ void ResourceFormatSaverBinaryInstance::write_variant(FileAccess *f, const Varia
 
 		} break;
 		case Variant::AABB: {
-
 			f->store_32(VARIANT_AABB);
 			AABB val = p_property;
 			f->store_real(val.position.x);
@@ -1478,7 +1366,6 @@ void ResourceFormatSaverBinaryInstance::write_variant(FileAccess *f, const Varia
 
 		} break;
 		case Variant::TRANSFORM2D: {
-
 			f->store_32(VARIANT_MATRIX32);
 			Transform2D val = p_property;
 			f->store_real(val.elements[0].x);
@@ -1490,7 +1377,6 @@ void ResourceFormatSaverBinaryInstance::write_variant(FileAccess *f, const Varia
 
 		} break;
 		case Variant::BASIS: {
-
 			f->store_32(VARIANT_MATRIX3);
 			Basis val = p_property;
 			f->store_real(val.elements[0].x);
@@ -1505,7 +1391,6 @@ void ResourceFormatSaverBinaryInstance::write_variant(FileAccess *f, const Varia
 
 		} break;
 		case Variant::TRANSFORM: {
-
 			f->store_32(VARIANT_TRANSFORM);
 			Transform val = p_property;
 			f->store_real(val.basis.elements[0].x);
@@ -1523,7 +1408,6 @@ void ResourceFormatSaverBinaryInstance::write_variant(FileAccess *f, const Varia
 
 		} break;
 		case Variant::COLOR: {
-
 			f->store_32(VARIANT_COLOR);
 			Color val = p_property;
 			f->store_real(val.r);
@@ -1533,7 +1417,6 @@ void ResourceFormatSaverBinaryInstance::write_variant(FileAccess *f, const Varia
 
 		} break;
 		case Variant::STRING_NAME: {
-
 			f->store_32(VARIANT_STRING_NAME);
 			String val = p_property;
 			save_unicode_string(f, val);
@@ -1565,14 +1448,12 @@ void ResourceFormatSaverBinaryInstance::write_variant(FileAccess *f, const Varia
 
 		} break;
 		case Variant::_RID: {
-
 			f->store_32(VARIANT_RID);
 			WARN_PRINT("Can't save RIDs.");
 			RID val = p_property;
 			f->store_32(val.get_id());
 		} break;
 		case Variant::OBJECT: {
-
 			f->store_32(VARIANT_OBJECT);
 			RES res = p_property;
 			if (res.is_null()) {
@@ -1584,7 +1465,6 @@ void ResourceFormatSaverBinaryInstance::write_variant(FileAccess *f, const Varia
 				f->store_32(OBJECT_EXTERNAL_RESOURCE_INDEX);
 				f->store_32(external_resources[res]);
 			} else {
-
 				if (!resource_set.has(res)) {
 					f->store_32(OBJECT_EMPTY);
 					ERR_FAIL_MSG("Resource was not pre cached for the resource section, most likely due to circular reference.");
@@ -1597,18 +1477,15 @@ void ResourceFormatSaverBinaryInstance::write_variant(FileAccess *f, const Varia
 
 		} break;
 		case Variant::CALLABLE: {
-
 			f->store_32(VARIANT_CALLABLE);
 			WARN_PRINT("Can't save Callables.");
 		} break;
 		case Variant::SIGNAL: {
-
 			f->store_32(VARIANT_SIGNAL);
 			WARN_PRINT("Can't save Signals.");
 		} break;
 
 		case Variant::DICTIONARY: {
-
 			f->store_32(VARIANT_DICTIONARY);
 			Dictionary d = p_property;
 			f->store_32(uint32_t(d.size()));
@@ -1617,7 +1494,6 @@ void ResourceFormatSaverBinaryInstance::write_variant(FileAccess *f, const Varia
 			d.get_key_list(&keys);
 
 			for (List<Variant>::Element *E = keys.front(); E; E = E->next()) {
-
 				/*
 				if (!_check_type(dict[E->get()]))
 					continue;
@@ -1629,18 +1505,15 @@ void ResourceFormatSaverBinaryInstance::write_variant(FileAccess *f, const Varia
 
 		} break;
 		case Variant::ARRAY: {
-
 			f->store_32(VARIANT_ARRAY);
 			Array a = p_property;
 			f->store_32(uint32_t(a.size()));
 			for (int i = 0; i < a.size(); i++) {
-
 				write_variant(f, a[i], resource_set, external_resources, string_map);
 			}
 
 		} break;
 		case Variant::PACKED_BYTE_ARRAY: {
-
 			f->store_32(VARIANT_RAW_ARRAY);
 			Vector<uint8_t> arr = p_property;
 			int len = arr.size();
@@ -1651,7 +1524,6 @@ void ResourceFormatSaverBinaryInstance::write_variant(FileAccess *f, const Varia
 
 		} break;
 		case Variant::PACKED_INT32_ARRAY: {
-
 			f->store_32(VARIANT_INT32_ARRAY);
 			Vector<int32_t> arr = p_property;
 			int len = arr.size();
@@ -1662,7 +1534,6 @@ void ResourceFormatSaverBinaryInstance::write_variant(FileAccess *f, const Varia
 
 		} break;
 		case Variant::PACKED_INT64_ARRAY: {
-
 			f->store_32(VARIANT_INT64_ARRAY);
 			Vector<int64_t> arr = p_property;
 			int len = arr.size();
@@ -1673,7 +1544,6 @@ void ResourceFormatSaverBinaryInstance::write_variant(FileAccess *f, const Varia
 
 		} break;
 		case Variant::PACKED_FLOAT32_ARRAY: {
-
 			f->store_32(VARIANT_FLOAT32_ARRAY);
 			Vector<float> arr = p_property;
 			int len = arr.size();
@@ -1685,7 +1555,6 @@ void ResourceFormatSaverBinaryInstance::write_variant(FileAccess *f, const Varia
 
 		} break;
 		case Variant::PACKED_FLOAT64_ARRAY: {
-
 			f->store_32(VARIANT_FLOAT64_ARRAY);
 			Vector<double> arr = p_property;
 			int len = arr.size();
@@ -1697,7 +1566,6 @@ void ResourceFormatSaverBinaryInstance::write_variant(FileAccess *f, const Varia
 
 		} break;
 		case Variant::PACKED_STRING_ARRAY: {
-
 			f->store_32(VARIANT_STRING_ARRAY);
 			Vector<String> arr = p_property;
 			int len = arr.size();
@@ -1709,7 +1577,6 @@ void ResourceFormatSaverBinaryInstance::write_variant(FileAccess *f, const Varia
 
 		} break;
 		case Variant::PACKED_VECTOR3_ARRAY: {
-
 			f->store_32(VARIANT_VECTOR3_ARRAY);
 			Vector<Vector3> arr = p_property;
 			int len = arr.size();
@@ -1723,7 +1590,6 @@ void ResourceFormatSaverBinaryInstance::write_variant(FileAccess *f, const Varia
 
 		} break;
 		case Variant::PACKED_VECTOR2_ARRAY: {
-
 			f->store_32(VARIANT_VECTOR2_ARRAY);
 			Vector<Vector2> arr = p_property;
 			int len = arr.size();
@@ -1736,7 +1602,6 @@ void ResourceFormatSaverBinaryInstance::write_variant(FileAccess *f, const Varia
 
 		} break;
 		case Variant::PACKED_COLOR_ARRAY: {
-
 			f->store_32(VARIANT_COLOR_ARRAY);
 			Vector<Color> arr = p_property;
 			int len = arr.size();
@@ -1751,17 +1616,14 @@ void ResourceFormatSaverBinaryInstance::write_variant(FileAccess *f, const Varia
 
 		} break;
 		default: {
-
 			ERR_FAIL_MSG("Invalid variant.");
 		}
 	}
 }
 
 void ResourceFormatSaverBinaryInstance::_find_resources(const Variant &p_variant, bool p_main) {
-
 	switch (p_variant.get_type()) {
 		case Variant::OBJECT: {
-
 			RES res = p_variant;
 
 			if (res.is_null() || external_resources.has(res))
@@ -1785,9 +1647,7 @@ void ResourceFormatSaverBinaryInstance::_find_resources(const Variant &p_variant
 			res->get_property_list(&property_list);
 
 			for (List<PropertyInfo>::Element *E = property_list.front(); E; E = E->next()) {
-
 				if (E->get().usage & PROPERTY_USAGE_STORAGE) {
-
 					Variant value = res->get(E->get().name);
 					if (E->get().usage & PROPERTY_USAGE_RESOURCE_NOT_PERSISTENT) {
 						RES sres = value;
@@ -1811,11 +1671,9 @@ void ResourceFormatSaverBinaryInstance::_find_resources(const Variant &p_variant
 		} break;
 
 		case Variant::ARRAY: {
-
 			Array varray = p_variant;
 			int len = varray.size();
 			for (int i = 0; i < len; i++) {
-
 				const Variant &v = varray.get(i);
 				_find_resources(v);
 			}
@@ -1823,12 +1681,10 @@ void ResourceFormatSaverBinaryInstance::_find_resources(const Variant &p_variant
 		} break;
 
 		case Variant::DICTIONARY: {
-
 			Dictionary d = p_variant;
 			List<Variant> keys;
 			d.get_key_list(&keys);
 			for (List<Variant>::Element *E = keys.front(); E; E = E->next()) {
-
 				_find_resources(E->get());
 				Variant v = d[E->get()];
 				_find_resources(v);
@@ -1849,7 +1705,6 @@ void ResourceFormatSaverBinaryInstance::_find_resources(const Variant &p_variant
 }
 
 void ResourceFormatSaverBinaryInstance::save_unicode_string(FileAccess *f, const String &p_string, bool p_bit_on_len) {
-
 	CharString utf8 = p_string.utf8();
 	if (p_bit_on_len) {
 		f->store_32((utf8.length() + 1) | 0x80000000);
@@ -1860,7 +1715,6 @@ void ResourceFormatSaverBinaryInstance::save_unicode_string(FileAccess *f, const
 }
 
 int ResourceFormatSaverBinaryInstance::get_string_index(const String &p_string) {
-
 	StringName s = p_string;
 	if (string_map.has(s))
 		return string_map[s];
@@ -1871,7 +1725,6 @@ int ResourceFormatSaverBinaryInstance::get_string_index(const String &p_string)
 }
 
 Error ResourceFormatSaverBinaryInstance::save(const String &p_path, const RES &p_resource, uint32_t p_flags) {
-
 	Error err;
 	if (p_flags & ResourceSaver::FLAG_COMPRESS) {
 		FileAccessCompressed *fac = memnew(FileAccessCompressed);
@@ -1932,9 +1785,7 @@ Error ResourceFormatSaverBinaryInstance::save(const String &p_path, const RES &p
 	List<ResourceData> resources;
 
 	{
-
 		for (List<RES>::Element *E = saved_resources.front(); E; E = E->next()) {
-
 			ResourceData &rd = resources.push_back(ResourceData())->get();
 			rd.type = E->get()->get_class();
 
@@ -1942,7 +1793,6 @@ Error ResourceFormatSaverBinaryInstance::save(const String &p_path, const RES &p
 			E->get()->get_property_list(&property_list);
 
 			for (List<PropertyInfo>::Element *F = property_list.front(); F; F = F->next()) {
-
 				if (skip_editor && F->get().name.begins_with("__editor"))
 					continue;
 				if ((F->get().usage & PROPERTY_USAGE_STORAGE)) {
@@ -1989,7 +1839,6 @@ Error ResourceFormatSaverBinaryInstance::save(const String &p_path, const RES &p
 	}
 
 	for (int i = 0; i < save_order.size(); i++) {
-
 		save_unicode_string(f, save_order[i]->get_save_class());
 		String path = save_order[i]->get_path();
 		path = relative_paths ? local_path.path_to_file(path) : path;
@@ -2001,10 +1850,8 @@ Error ResourceFormatSaverBinaryInstance::save(const String &p_path, const RES &p
 	Set<int> used_indices;
 
 	for (List<RES>::Element *E = saved_resources.front(); E; E = E->next()) {
-
 		RES r = E->get();
 		if (r->get_path() == "" || r->get_path().find("::") != -1) {
-
 			if (r->get_subindex() != 0) {
 				if (used_indices.has(r->get_subindex())) {
 					r->set_subindex(0); //repeated
@@ -2016,7 +1863,6 @@ Error ResourceFormatSaverBinaryInstance::save(const String &p_path, const RES &p
 	}
 
 	for (List<RES>::Element *E = saved_resources.front(); E; E = E->next()) {
-
 		RES r = E->get();
 		if (r->get_path() == "" || r->get_path().find("::") != -1) {
 			if (r->get_subindex() == 0) {
@@ -2047,7 +1893,6 @@ Error ResourceFormatSaverBinaryInstance::save(const String &p_path, const RES &p
 
 	//now actually save the resources
 	for (List<ResourceData>::Element *E = resources.front(); E; E = E->next()) {
-
 		ResourceData &rd = E->get();
 
 		ofs_table.push_back(f->get_position());
@@ -2055,7 +1900,6 @@ Error ResourceFormatSaverBinaryInstance::save(const String &p_path, const RES &p
 		f->store_32(rd.properties.size());
 
 		for (List<Property>::Element *F = rd.properties.front(); F; F = F->next()) {
-
 			Property &p = F->get();
 			f->store_32(p.name_idx);
 			_write_variant(p.value, F->get().pi);
@@ -2084,19 +1928,16 @@ Error ResourceFormatSaverBinaryInstance::save(const String &p_path, const RES &p
 }
 
 Error ResourceFormatSaverBinary::save(const String &p_path, const RES &p_resource, uint32_t p_flags) {
-
 	String local_path = ProjectSettings::get_singleton()->localize_path(p_path);
 	ResourceFormatSaverBinaryInstance saver;
 	return saver.save(local_path, p_resource, p_flags);
 }
 
 bool ResourceFormatSaverBinary::recognize(const RES &p_resource) const {
-
 	return true; //all recognized
 }
 
 void ResourceFormatSaverBinary::get_recognized_extensions(const RES &p_resource, List<String> *p_extensions) const {
-
 	String base = p_resource->get_base_extension().to_lower();
 	p_extensions->push_back(base);
 	if (base != "res")