Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

-fix bug in cache for atlas import/export

Browse source 
-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
This commit is contained in:
Juan Linietsky 2014-03-13 22:57:24 -03:00
parent a65edb4caa
commit 31ce3c5fd0
136 changed files with 10784 additions and 1578 deletions
Download patch file Download diff file Expand all files Collapse all files

12
scene/io/resource_format_image.cpp
View file

@ -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);
}