diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2014-02-26 10:14:42 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2014-02-26 10:14:42 -0300 |
| commit | a919683228122dc47cb314ef6c3245ec23735568 (patch) | |
| tree | 47aa45e9c2cf5138b51a1a47d8f919c0961469ee | |
| parent | fbcc81362c20647f272d61fb5968bf1524706028 (diff) | |
| parent | 4f65f31826d942ebba48465a550c30f9996b85dc (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | SConstruct | 2 | ||||
| -rw-r--r-- | tools/editor/io_plugins/editor_texture_import_plugin.cpp | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index de9eed200a..abe1a234f5 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 93e48a069f..4df8e0089d 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 ff4da6af13..90dcbb97e0 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; } |