diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-13 15:53:32 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-14 10:02:31 +0100 |
| commit | d2537407efffde15372962ffca864b7400ade345 (patch) | |
| tree | 4d99ff9f4814abc3e531a447794a62139ece1178 /modules/assimp | |
| parent | 3679d49f4b709fd56e872633ead73008bc3e1c43 (diff) | |
Fix various GCC compilation warnings after Vulkan merge
Part of #36132.
Diffstat (limited to 'modules/assimp')
| -rw-r--r-- | modules/assimp/import_utils.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/assimp/import_utils.h b/modules/assimp/import_utils.h index 0eb055956b..d037efce21 100644 --- 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 |