[Bf-extensions-cvs] [260ca332] master: glTF importer: import custome properties from default scene

[Julien Duroure]

Commit: 260ca332f88f643a302bcabf140e3c471c8c621b
Author: Julien Duroure
Date:   Sun Jul 4 17:38:11 2021 +0200
Branches: master
https://developer.blender.org/rBA260ca332f88f643a302bcabf140e3c471c8c621b

glTF importer: import custome properties from default scene

===================================================================

M	io_scene_gltf2/__init__.py
M	io_scene_gltf2/blender/exp/gltf2_blender_gather_animation_samplers.py
M	io_scene_gltf2/blender/imp/gltf2_blender_scene.py

===================================================================

diff --git a/io_scene_gltf2/__init__.py b/io_scene_gltf2/__init__.py
index 187aac4e..a07fa7b7 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, 7, 7),
+    "version": (1, 7, 8),
     '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_gather_animation_samplers.py b/io_scene_gltf2/blender/exp/gltf2_blender_gather_animation_samplers.py
index 362e5b69..57df6306 100755
--- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_animation_samplers.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_animation_samplers.py
@@ -331,6 +331,7 @@ def __gather_output(channels: typing.Tuple[bpy.types.FCurve],
         object_path = get_target_object_path(target_datapath)
     else:
         object_path = None
+
     is_armature_animation = bake_bone is not None or (blender_object_if_armature is not None and object_path != "")
 
     if is_armature_animation:
diff --git a/io_scene_gltf2/blender/imp/gltf2_blender_scene.py b/io_scene_gltf2/blender/imp/gltf2_blender_scene.py
index d9dc9092..05520228 100755
--- a/io_scene_gltf2/blender/imp/gltf2_blender_scene.py
+++ b/io_scene_gltf2/blender/imp/gltf2_blender_scene.py
@@ -17,6 +17,7 @@ import bpy
 from .gltf2_blender_node import BlenderNode
 from .gltf2_blender_animation import BlenderAnimation
 from .gltf2_blender_vnode import VNode, compute_vnodes
+from ..com.gltf2_blender_extras import set_extras
 
 
 class BlenderScene():
@@ -34,6 +35,10 @@ class BlenderScene():
         if scene.render.engine not in ['CYCLES', 'BLENDER_EEVEE']:
             scene.render.engine = "BLENDER_EEVEE"
 
+        if gltf.data.scene is not None:
+            pyscene = gltf.data.scenes[gltf.data.scene]
+            set_extras(scene, pyscene.extras)
+
         compute_vnodes(gltf)
 
         gltf.display_current_node = 0  # for debugging