Fix various GCC compilation warnings after Vulkan merge

Part of #36132.
2020-02-13 15:53:32 +01:00
parent 3679d49f4b
commit d2537407ef
19 changed files with 71 additions and 53 deletions
--- a/modules/assimp/import_utils.h
+++ b/modules/assimp/import_utils.h
@ -320,10 +320,10 @@ public:
 	static void set_texture_mapping_mode(aiTextureMapMode *map_mode, Ref<ImageTexture> texture) {
 		ERR_FAIL_COND(texture.is_null());
 		ERR_FAIL_COND(map_mode == NULL);
-		aiTextureMapMode tex_mode = map_mode[0];
-
 		// FIXME: Commented out during Vulkan port.
 		/*
+		aiTextureMapMode tex_mode = map_mode[0];
+
 		int32_t flags = Texture2D::FLAGS_DEFAULT;
 		if (tex_mode == aiTextureMapMode_Wrap) {
 			//Default