Merge branch 'import' into import-v2

Exairnous · Nov 7, 2022 · f6210e5 · f6210e5
2 parents d6325b5 + 0fb5c34
commit f6210e5
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 3 deletions.
diff --git a/addons/io_hubs_addon/components/definitions/background.py b/addons/io_hubs_addon/components/definitions/background.py
@@ -11,6 +11,7 @@ class Background(HubsComponent):
     }
 
     @classmethod
+
     def gather_import(cls, gltf, blender_object, component_name, component_value):
         blender_component = import_component(
             'environment-settings', blender_object)

diff --git a/addons/io_hubs_addon/components/definitions/video_texture_target.py b/addons/io_hubs_addon/components/definitions/video_texture_target.py
@@ -5,6 +5,7 @@
 from bpy.types import Object
 from ...io.utils import gather_joint_property, gather_node_property, delayed_gather
 
+
 BLANK_ID = "pXph8WBzMu9fung"
 
 

diff --git a/addons/io_hubs_addon/io/gltf_exporter.py b/addons/io_hubs_addon/io/gltf_exporter.py
@@ -2,6 +2,7 @@
 from ..components.components_registry import get_components_registry
 from .utils import gather_lightmap_texture_info, HUBS_CONFIG
 
+
 if bpy.app.version < (3, 0, 0):
     from io_scene_gltf2.io.exp.gltf2_io_user_extensions import export_user_extensions
     from io_scene_gltf2.blender.exp import gltf2_blender_export
@@ -195,7 +196,6 @@ def register():
     if bpy.app.version < (3, 0, 0):
         gltf2_blender_export.__gather_gltf = patched_gather_gltf
 
-
 def unregister():
     print("Unregister GLTF Exporter")
     if bpy.app.version < (3, 0, 0):

diff --git a/addons/io_hubs_addon/io/gltf_importer.py b/addons/io_hubs_addon/io/gltf_importer.py
@@ -234,7 +234,7 @@ def patched_BlenderScene_create(gltf):
 
     call_delayed_gathers()
 
-
+    
 def register():
     print("Register glTF Importer")
     if bpy.app.version < (3, 1, 0):

diff --git a/addons/io_hubs_addon/io/utils.py b/addons/io_hubs_addon/io/utils.py
@@ -338,7 +338,6 @@ def gather_color_property(export_settings, object, component, property_name, col
 
     return "#{0:02x}{1:02x}{2:02x}".format(c[0], c[1], c[2], 255)
 
-
 # MOZ_lightmap extension data
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,6 +5,7 @@
		from bpy.types import Object
		from ...io.utils import gather_joint_property, gather_node_property, delayed_gather


		BLANK_ID = "pXph8WBzMu9fung"


Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -338,7 +338,6 @@ def gather_color_property(export_settings, object, component, property_name, col

		return "#{0:02x}{1:02x}{2:02x}".format(c[0], c[1], c[2], 255)


		# MOZ_lightmap extension data


Expand Down