Merge branch 'master' of github.com:KhronosGroup/glTF-Blender-IO

AurL · Sep 25, 2018 · ffcf15c · ffcf15c
2 parents c1eb6e0 + 06380bb
commit ffcf15c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/addons/io_scene_gltf2/blender/com/gltf2_blender_image_util.py b/addons/io_scene_gltf2/blender/com/gltf2_blender_image_util.py
@@ -35,7 +35,9 @@ def create_image_file(context, blender_image, dst_path, file_format):
         src_path = src_path.replace('\\', '/')
         dst_path = dst_path.replace('\\', '/')
 
-        if dst_path != src_path:
+        # Check that source and destination path are not the same using os.path.abspath
+        # because bpy.path.abspath seems to not always return an absolute path
+        if os.path.abspath(dst_path) != os.path.abspath(src_path):
             shutil.copyfile(src_path, dst_path)
 
     else:

diff --git a/addons/io_scene_gltf2/blender/exp/gltf2_blender_filter.py b/addons/io_scene_gltf2/blender/exp/gltf2_blender_filter.py
@@ -187,7 +187,7 @@ def filter_apply(export_settings):
 
             current_blender_object = blender_object
 
-            if current_blender_object.type != 'CURVE':
+            if current_blender_object.type not in ('CURVE', 'FONT'):
                 continue
 
             if current_blender_object.data == current_blender_curve:

diff --git a/addons/io_scene_gltf2/blender/exp/gltf2_blender_generate.py b/addons/io_scene_gltf2/blender/exp/gltf2_blender_generate.py
@@ -1645,7 +1645,7 @@ def generate_node_instance(context,
         #
         #
 
-        if blender_object.type == 'MESH' or blender_object.type == 'CURVE':
+        if blender_object.type in ('MESH', 'CURVE', 'FONT'):
             mesh = get_mesh_index(glTF, blender_object.data.name)
 
             if mesh >= 0: