diff options
| author | Julien Duroure <julien.duroure@gmail.com> | 2020-05-04 18:04:32 +0300 |
|---|---|---|
| committer | Julien Duroure <julien.duroure@gmail.com> | 2020-05-04 18:04:32 +0300 |
| commit | 930bed3295082ee4cc75b4e183e1a657e9735c7f (patch) | |
| tree | b26893a26fcde5f12e0b37928057dfdcd4c7ea57 | |
| parent | 8a1b0edd88f3f47011acc110c684f5285b2e5555 (diff) | |
| parent | 0650f599aa174ea79c75bd4825696c1a9f56aeb2 (diff) | |
Merge branch 'blender-v2.83-release'
| -rwxr-xr-x | io_scene_gltf2/__init__.py | 2 | ||||
| -rwxr-xr-x | io_scene_gltf2/blender/imp/gltf2_blender_material.py | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/io_scene_gltf2/__init__.py b/io_scene_gltf2/__init__.py index 666883f4..1fa5b375 100755 --- a/io_scene_gltf2/__init__.py +++ b/io_scene_gltf2/__init__.py @@ -15,7 +15,7 @@ bl_info = { 'name': 'glTF 2.0 format', 'author': 'Julien Duroure, Norbert Nopper, Urs Hanselmann, Moritz Becher, Benjamin Schmithüsen, Jim Eckerlein, and many external contributors', - "version": (1, 2, 70), + "version": (1, 2, 71), 'blender': (2, 83, 9), 'location': 'File > Import-Export', 'description': 'Import-Export as glTF 2.0', diff --git a/io_scene_gltf2/blender/imp/gltf2_blender_material.py b/io_scene_gltf2/blender/imp/gltf2_blender_material.py index 1071f7f1..bb3cea09 100755 --- a/io_scene_gltf2/blender/imp/gltf2_blender_material.py +++ b/io_scene_gltf2/blender/imp/gltf2_blender_material.py @@ -33,8 +33,6 @@ class BlenderMaterial(): name = pymaterial.name if name is None: name = "Material_" + str(material_idx) - if vertex_color is not None: - name += "_" + vertex_color mat = bpy.data.materials.new(name) pymaterial.blender_material[vertex_color] = mat.name |