Merge branch 'main' into main

Simarilius-uk · Sep 2, 2024 · 2f8fec3 · 2f8fec3
2 parents 98627d0 + 382ba05
commit 2f8fec3
Show file tree

Hide file tree

Showing 6 changed files with 801 additions and 11 deletions.
diff --git a/i_scene_cp77_gltf/importers/entity_import.py b/i_scene_cp77_gltf/importers/entity_import.py
@@ -221,7 +221,6 @@ def importEnt(with_materials, filepath='', appearances=[], exclude_meshes=[], in
                             app_name=a['appearanceName']['$value']
 
                 if ent_app_idx<0 and app_name =='default':
-                    #ent_default=j['Data']['RootChunk']['defaultAppearance']['$value']
                     for i,a in enumerate(ent_apps):
                         if a['name']['$value']==ent_default:
                             print('appearance matched, id = ',i)

diff --git a/i_scene_cp77_gltf/importers/import_with_materials.py b/i_scene_cp77_gltf/importers/import_with_materials.py
@@ -46,6 +46,7 @@ def CP77GLBimport(self, with_materials, remap_depot, exclude_unused_mats=True, i
    # obj = None
     start_time = time.time()
     loadfiles=self.files
+    DepotPath=cp77_addon_prefs
     appearances=self.appearances.split(",")
     if not cp77_addon_prefs.non_verbose:
         if ".anims.glb" in self.filepath:
@@ -149,6 +150,7 @@ def CP77GLBimport(self, with_materials, remap_depot, exclude_unused_mats=True, i
         if DepotPath == None:
             print('DepotPath not set')
             break
+
         #DepotPath = str(obj["MaterialRepo"])  + "\\"
         context=bpy.context
         if remap_depot and os.path.exists(context.preferences.addons[__name__.split('.')[0]].preferences.depotfolder_path):
@@ -184,6 +186,7 @@ def CP77GLBimport(self, with_materials, remap_depot, exclude_unused_mats=True, i
 
         if import_garmentsupport:
             manage_garment_support(existingMeshes, gltf_importer)
+
 
     if not cp77_addon_prefs.non_verbose:
         print(f"GLB Import Time: {(time.time() - start_time)} Seconds")