From 31ce3c5fd0300aac1e86bced1efc5f9ec94bdb6b Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Thu, 13 Mar 2014 22:57:24 -0300 Subject: -fix bug in cache for atlas import/export -fix some menus -fixed bug in out transition curves -detect and remove file:/// in collada -remove multiscript for now -remove dependencies on mouse in OS, moved to Input -avoid fscache from screwing up (fix might make it slower, but it works) -funcref was missing, it's there now --- scene/io/resource_format_image.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'scene/io') diff --git a/scene/io/resource_format_image.cpp b/scene/io/resource_format_image.cpp index 98453bcabb..b0fcf9717b 100644 --- a/scene/io/resource_format_image.cpp +++ b/scene/io/resource_format_image.cpp @@ -131,11 +131,11 @@ RES ResourceFormatLoaderImage::load(const String &p_path,const String& p_origina uint32_t flags=0; - if (bool(GLOBAL_DEF("texture_import/filter",true))) + if (bool(GLOBAL_DEF("image_loader/filter",true))) flags|=Texture::FLAG_FILTER; - if (bool(GLOBAL_DEF("texture_import/gen_mipmaps",true))) + if (bool(GLOBAL_DEF("image_loader/gen_mipmaps",true))) flags|=Texture::FLAG_MIPMAPS; - if (bool(GLOBAL_DEF("texture_import/repeat",false))) + if (bool(GLOBAL_DEF("image_loader/repeat",false))) flags|=Texture::FLAG_REPEAT; @@ -192,8 +192,8 @@ ResourceFormatLoaderImage::ResourceFormatLoaderImage() { max_texture_size = GLOBAL_DEF("debug/max_texture_size",0); GLOBAL_DEF("debug/max_texture_size_alert",false); debug_load_times=GLOBAL_DEF("debug/image_load_times",false); - GLOBAL_DEF("texture_import/filter",true); - GLOBAL_DEF("texture_import/gen_mipmaps",true); - GLOBAL_DEF("texture_import/repeat",true); + GLOBAL_DEF("image_loader/filter",true); + GLOBAL_DEF("image_loader/gen_mipmaps",true); + GLOBAL_DEF("image_loader/repeat",false); } -- cgit v1.2.3