summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2017-11-29 14:43:40 +0100
committerGitHub <noreply@github.com>2017-11-29 14:43:40 +0100
commit38402fb49e80b9bb5ae5c3c8817d69feb5174576 (patch)
tree46eefd002f375fd20ceee32f876a6526b0c12c11
parent2ab7a0f64cdad863ab31d2c10e58e98d00ae84e7 (diff)
parent1746fbd1c6d8210bc093897bc9d5c0617ae7791d (diff)
Merge pull request #13395 from ISylvox/export-logo
Enhance iOS and UWP logo on Export dialog
-rw-r--r--platform/iphone/export/export.cpp6
-rw-r--r--platform/uwp/logo.pngbin1882 -> 1519 bytes
2 files changed, 2 insertions, 4 deletions
diff --git a/platform/iphone/export/export.cpp b/platform/iphone/export/export.cpp
index 8ab1cbc435..b05bb9ab09 100644
--- a/platform/iphone/export/export.cpp
+++ b/platform/iphone/export/export.cpp
@@ -37,7 +37,7 @@
#include "io/zip_io.h"
#include "os/file_access.h"
#include "os/os.h"
-#include "platform/osx/logo.gen.h"
+#include "platform/iphone/logo.gen.h"
#include "project_settings.h"
#include "string.h"
#include "version.h"
@@ -977,9 +977,7 @@ bool EditorExportPlatformIOS::can_export(const Ref<EditorExportPreset> &p_preset
EditorExportPlatformIOS::EditorExportPlatformIOS() {
- ///@TODO need to create the correct logo
- // Ref<Image> img = memnew(Image(_iphone_logo));
- Ref<Image> img = memnew(Image(_osx_logo));
+ Ref<Image> img = memnew(Image(_iphone_logo));
logo.instance();
logo->create_from_image(img);
}
diff --git a/platform/uwp/logo.png b/platform/uwp/logo.png
index 4376abd563..9017a30636 100644
--- a/platform/uwp/logo.png
+++ b/platform/uwp/logo.png
Binary files differ