From af59a1b633abf5b58423fddc35f80fb648cb0962 Mon Sep 17 00:00:00 2001 From: Vinzenz Feenstra Date: Mon, 24 Feb 2014 12:16:40 +0100 Subject: [PATCH 1/3] Typo in 'Atlas Texture' import menu entry Signed-off-by: Vinzenz Feenstra --- tools/editor/io_plugins/editor_texture_import_plugin.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/editor/io_plugins/editor_texture_import_plugin.cpp b/tools/editor/io_plugins/editor_texture_import_plugin.cpp index 2e6e7551369..9ca33e33745 100644 --- a/tools/editor/io_plugins/editor_texture_import_plugin.cpp +++ b/tools/editor/io_plugins/editor_texture_import_plugin.cpp @@ -610,7 +610,7 @@ String EditorTextureImportPlugin::get_visible_name() const { } break; case MODE_ATLAS: { - return "Atlas Teture"; + return "Atlas Texture"; } break; } From 942f14747b704a665299aa2f82bbad6bc24a4b9d Mon Sep 17 00:00:00 2001 From: C4NCER Date: Tue, 25 Feb 2014 19:33:09 +1300 Subject: [PATCH 2/3] Switch from using deprecated Options class to Variables --- SConstruct | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SConstruct b/SConstruct index 93e48a069f8..4df8e0089d7 100644 --- a/SConstruct +++ b/SConstruct @@ -88,7 +88,7 @@ if profile: elif os.path.isfile(profile+".py"): customs.append(profile+".py") -opts=Options(customs, ARGUMENTS) +opts=Variables(customs, ARGUMENTS) opts.Add('target', 'Compile Target (debug/profile/release).', "debug") opts.Add('platform','Platform: '+str(platform_list)+'(sfml).',"") opts.Add('python','Build Python Support: (yes/no)','no') From 68fa537c3e6a82c1ce26f54511ce92c9b90d9c7a Mon Sep 17 00:00:00 2001 From: C4NCER Date: Tue, 25 Feb 2014 21:38:38 +1300 Subject: [PATCH 3/3] add logo.h to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index de9eed200a4..abe1a234f52 100644 --- a/.gitignore +++ b/.gitignore @@ -233,3 +233,4 @@ Desktop.ini # Recycle Bin used on file shares $RECYCLE.BIN/ +logo.h