From 3f335ce3d446372eeb9ed87f7e117099c4d2dd6a Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Tue, 11 Jun 2019 15:43:37 -0300 Subject: Texture refactor -Texture renamed to Texture2D -TextureLayered as base now inherits 2Darray, cubemap and cubemap array -Removed all references to flags in textures (they will go in the shader) -Texture3D gone for now (will come back later done properly) -Create base rasterizer for RenderDevice, RasterizerRD --- platform/android/export/export.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'platform/android/export') diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp index 78d87c5629..7bbcb8cfa2 100644 --- a/platform/android/export/export.cpp +++ b/platform/android/export/export.cpp @@ -1424,7 +1424,7 @@ public: return "Android"; } - virtual Ref get_logo() const { + virtual Ref get_logo() const { return logo; } @@ -1639,7 +1639,7 @@ public: #undef CLEANUP_AND_RETURN } - virtual Ref get_run_icon() const { + virtual Ref get_run_icon() const { return run_icon; } -- cgit v1.2.3