diff options
author | Julien Duroure <julien.duroure@gmail.com> | 2020-11-30 20:49:27 +0300 |
---|---|---|
committer | Julien Duroure <julien.duroure@gmail.com> | 2020-11-30 20:49:27 +0300 |
commit | cde7574c05bd44e172827eafac6f9ffb7fe76a13 (patch) | |
tree | e6cc0795915bc75fb1bdbb038514b2641369c697 | |
parent | 5088c8d9d735a7fe91cd187d03d3afcb795bd6fa (diff) |
glTF: code cleanup
6 files changed, 3 insertions, 41 deletions
diff --git a/io_scene_gltf2/__init__.py b/io_scene_gltf2/__init__.py index 4cf7b207..a7c1da18 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, Scurest, Norbert Nopper, Urs Hanselmann, Moritz Becher, Benjamin Schmithüsen, Jim Eckerlein, and many external contributors', - "version": (1, 5, 4), + "version": (1, 5, 5), 'blender': (2, 91, 0), 'location': 'File > Import-Export', 'description': 'Import-Export as glTF 2.0', diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_extract.py b/io_scene_gltf2/blender/exp/gltf2_blender_extract.py index c0311b98..5a78ab04 100755 --- a/io_scene_gltf2/blender/exp/gltf2_blender_extract.py +++ b/io_scene_gltf2/blender/exp/gltf2_blender_extract.py @@ -13,7 +13,7 @@ # limitations under the License. import numpy as np -from mathutils import Vector, Quaternion, Matrix +from mathutils import Vector from . import gltf2_blender_export_keys from ...io.com.gltf2_io_debug import print_console diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_gather_materials_pbr_metallic_roughness.py b/io_scene_gltf2/blender/exp/gltf2_blender_gather_materials_pbr_metallic_roughness.py index 5b3c1bc6..c04c6e07 100755 --- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_materials_pbr_metallic_roughness.py +++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_materials_pbr_metallic_roughness.py @@ -18,7 +18,6 @@ from io_scene_gltf2.io.com import gltf2_io from io_scene_gltf2.blender.exp import gltf2_blender_gather_texture_info, gltf2_blender_search_node_tree from io_scene_gltf2.blender.exp import gltf2_blender_get from io_scene_gltf2.blender.exp.gltf2_blender_gather_cache import cached -from io_scene_gltf2.io.com.gltf2_io_debug import print_console from io_scene_gltf2.io.exp.gltf2_io_user_extensions import export_user_extensions diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_gather_materials_unlit.py b/io_scene_gltf2/blender/exp/gltf2_blender_gather_materials_unlit.py index f000bb56..625b23dd 100644 --- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_materials_unlit.py +++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_materials_unlit.py @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -from io_scene_gltf2.io.com import gltf2_io from io_scene_gltf2.blender.exp import gltf2_blender_gather_texture_info from io_scene_gltf2.blender.exp import gltf2_blender_get diff --git a/io_scene_gltf2/blender/imp/gltf2_blender_mesh.py b/io_scene_gltf2/blender/imp/gltf2_blender_mesh.py index 0311c3b0..a6896491 100755 --- a/io_scene_gltf2/blender/imp/gltf2_blender_mesh.py +++ b/io_scene_gltf2/blender/imp/gltf2_blender_mesh.py @@ -13,7 +13,7 @@ # limitations under the License. import bpy -from mathutils import Vector, Matrix +from mathutils import Matrix import numpy as np from ...io.imp.gltf2_io_binary import BinaryData diff --git a/io_scene_gltf2/io/com/gltf2_io_color_management.py b/io_scene_gltf2/io/com/gltf2_io_color_management.py deleted file mode 100644 index 31ac5045..00000000 --- a/io_scene_gltf2/io/com/gltf2_io_color_management.py +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 2019 The glTF-Blender-IO authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - - -def color_srgb_to_scene_linear(c): - """ - Convert from sRGB to scene linear color space. - - Source: Cycles addon implementation, node_color.h. - """ - if c < 0.04045: - return 0.0 if c < 0.0 else c * (1.0 / 12.92) - else: - return ((c + 0.055) * (1.0 / 1.055)) ** 2.4 - -def color_linear_to_srgb(c): - """ - Convert from linear to sRGB color space. - - Source: Cycles addon implementation, node_color.h. - """ - if c < 0.0031308: - return 0.0 if c < 0.0 else c * 12.92 - else: - return 1.055 * c ** (1.0 / 2.4) - 0.055 |