summaryrefslogtreecommitdiff
path: root/scene/io/resource_format_image.cpp
diff options
context:
space:
mode:
authorKostadin Damyanov <maxmight@gmail.com>2015-06-26 21:35:47 +0300
committerKostadin Damyanov <maxmight@gmail.com>2015-06-26 21:35:47 +0300
commite0e54ea7d456c0fabd8f3f9b2667a69ff520f852 (patch)
tree9ce4e0b6db40ac2ab07b8582e57282fe63130165 /scene/io/resource_format_image.cpp
parentf61eb5fd8e13642c82364f8ee66a0f6c791a4511 (diff)
parenta67486a39ee629acac068a6d014015944cf83bb3 (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'scene/io/resource_format_image.cpp')
-rw-r--r--scene/io/resource_format_image.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/scene/io/resource_format_image.cpp b/scene/io/resource_format_image.cpp
index 2663ac0762..8527498fc2 100644
--- a/scene/io/resource_format_image.cpp
+++ b/scene/io/resource_format_image.cpp
@@ -180,6 +180,11 @@ RES ResourceFormatLoaderImage::load(const String &p_path,const String& p_origina
if (flags_found["tolinear"])
flags|=Texture::FLAG_CONVERT_TO_LINEAR;
}
+
+ if (flags_found.has("mirroredrepeat")) {
+ if (flags_found["mirroredrepeat"])
+ flags|=Texture::FLAG_MIRRORED_REPEAT;
+ }
if (debug_load_times)
begtime=OS::get_singleton()->get_ticks_usec();