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 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') diff --git a/tools/editor/io_plugins/editor_texture_import_plugin.cpp b/tools/editor/io_plugins/editor_texture_import_plugin.cpp index ff4da6af13f..90dcbb97e03 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; }