diff options
| author | Olafur Haukur Flygenring <olifly@gmail.com> | 2014-02-19 20:52:07 +0000 |
|---|---|---|
| committer | Olafur Haukur Flygenring <olifly@gmail.com> | 2014-02-19 20:52:07 +0000 |
| commit | c78a06536ebc7c2c2718eaf800c8227bdb07a931 (patch) | |
| tree | 6e8d888dfe91c9717b85c18bca6e73d6a43789aa /scene/io/resource_format_image.cpp | |
| parent | ec448845e295c4b8e897793b0971ebd9912e3101 (diff) | |
| parent | 449bc14fb49d3266f5bd82dbe3c53a4b9f4062da (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'scene/io/resource_format_image.cpp')
| -rw-r--r-- | scene/io/resource_format_image.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/io/resource_format_image.cpp b/scene/io/resource_format_image.cpp index d71f544628..98453bcabb 100644 --- a/scene/io/resource_format_image.cpp +++ b/scene/io/resource_format_image.cpp @@ -135,7 +135,7 @@ RES ResourceFormatLoaderImage::load(const String &p_path,const String& p_origina flags|=Texture::FLAG_FILTER; if (bool(GLOBAL_DEF("texture_import/gen_mipmaps",true))) flags|=Texture::FLAG_MIPMAPS; - if (bool(GLOBAL_DEF("texture_import/repeat",true))) + if (bool(GLOBAL_DEF("texture_import/repeat",false))) flags|=Texture::FLAG_REPEAT; |