Merge pull request #8067 from mhirsch/blender_export_texture_mode

export textures from blender with correct clip/repeat mode
mrdoob · Feb 7, 2016 · ffc405b · ffc405b
2 parents c1cd181 + 736729f
commit ffc405b
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/utils/exporters/blender/addons/io_three/exporter/api/texture.py b/utils/exporters/blender/addons/io_three/exporter/api/texture.py
@@ -155,12 +155,20 @@ def wrap(texture):
 
     """
     logger.debug("texture.wrap(%s)", texture)
-    wrapping = {
-        True: constants.WRAPPING.MIRROR,
-        False: constants.WRAPPING.REPEAT
-    }
-    return (wrapping[texture.use_mirror_x],
-            wrapping[texture.use_mirror_y])
+
+    if(texture.extension == "REPEAT"):
+        wrapping = {
+            True: constants.WRAPPING.MIRROR,
+            False: constants.WRAPPING.REPEAT
+        }
+        return (wrapping[texture.use_mirror_x],
+                wrapping[texture.use_mirror_y])
+
+    # provide closest available three.js behavior.
+    # other possible values: "CLIP", "EXTEND", "CLIP_CUBE", "CHECKER",
+    # best match CLAMP behavior
+    else:
+        return (constants.WRAPPING.CLAMP, constants.WRAPPING.CLAMP);
 
 
 def textures():