merging

Simarilius-uk · Feb 12, 2024 · cf8eb02 · cf8eb02
2 parents aa07bb2 + 0b1f16c
commit cf8eb02
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/simple_build.yml b/.github/workflows/simple_build.yml
@@ -10,12 +10,12 @@ jobs:
   Build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: vimtor/action-zip@v1.1
         with:
           files: i_scene_cp77_gltf/ 
           dest: latest_build.zip
-      - uses: actions/upload-artifact@v3.1.3
+      - uses: actions/upload-artifact@v4
         with:
           name: my-artifact
           path: ${{ github.workspace }}/latest_build.zip
diff --git a/i_scene_cp77_gltf/__init__.py b/i_scene_cp77_gltf/__init__.py
@@ -26,7 +26,7 @@
 bl_info = {
     "name": "Cyberpunk 2077 IO Suite",
     "author": "HitmanHimself, Turk, Jato, dragonzkiller, kwekmaster, glitchered, Simarilius, Doctor Presto, shotlastc, Rudolph2109",
-    "version": (1, 5, 2, 2),
+    "version": (1, 5, 2, 3),
     "blender": (3, 6, 0),
     "location": "File > Import-Export",
     "description": "Import and Export WolvenKit Cyberpunk2077 gLTF models with materials, Import .streamingsector and .ent from .json",

diff --git a/i_scene_cp77_gltf/importers/import_with_materials.py b/i_scene_cp77_gltf/importers/import_with_materials.py
@@ -13,7 +13,7 @@
 def objs_in_col(top_coll, objtype):
     return sum([len([o for o in col.objects if o.type==objtype]) for col in top_coll.children_recursive])+len([o for o in top_coll.objects if o.type==objtype])
 
-def CP77GLBimport(self, exclude_unused_mats=True, image_format='png', with_materials=True, filepath='', hide_armatures=True, update_gi=True, import_garmentsupport=False, files=[], directory='', appearances=[]):
+def CP77GLBimport(self, exclude_unused_mats=True, image_format='png', with_materials=True, filepath='', hide_armatures=True,  import_garmentsupport=False, files=[], directory='', appearances=[]):
 
     context=bpy.context
     loadfiles=self.files

diff --git a/i_scene_cp77_gltf/main/animtools.py b/i_scene_cp77_gltf/main/animtools.py
@@ -139,8 +139,8 @@ def add_anim_props(animation, action):
     track_keys_json = json.dumps(track_keys)
 
     # Add properties to the action
-    action["schemaType"] = schema['type']
-    action["schemaVersion"] = schema['version']
+    action["schema"] = schema
+   # action["schemaVersion"] = schema['version']
     action["animationType"] = animation_type
     action["frameClamping"] = frame_clamping
     action["frameClampingStartFrame"] = frame_clamping_start_frame
@@ -150,8 +150,8 @@ def add_anim_props(animation, action):
     action["constTrackKeys"] = const_track_keys
     action["trackKeys"] = track_keys
     action["fallbackFrameIndices"] = fallback_frame_indices
-    action["preferSIMD"] = optimizationHints['preferSIMD']
-    action["maxRotationCompression"] = optimizationHints['maxRotationCompression']
+    action["optimizationHints"] = optimizationHints
+    #action["maxRotationCompression"] = optimizationHints['maxRotationCompression']
 
 
 # Set the custom property on the action