Skip to content

Commit

Permalink
Merge pull request #173 from Simarilius-uk/main
Browse files Browse the repository at this point in the history
minor tweaks
  • Loading branch information
Simarilius-uk authored Sep 2, 2024
2 parents 382ba05 + 2f8fec3 commit a520374
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions i_scene_cp77_gltf/importers/entity_import.py
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,7 @@ def importEnt(with_materials, filepath='', appearances=[], exclude_meshes=[], in
y=None
z=None
bindname=None
bindpt=None
pt_trans=[0,0,0]
pt_rot=[0,0,0,0]
pt_eul=None
Expand Down
3 changes: 2 additions & 1 deletion i_scene_cp77_gltf/importers/import_with_materials.py
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ def CP77GLBimport(self, with_materials, remap_depot, exclude_unused_mats=True, i
if name not in existingMaterials:
bpy.data.materials.remove(bpy.data.materials[name], do_unlink=True, do_id_user=True, do_ui_user=True)

#Kwek: Gate this--do the block iff corresponding Material.json exist
#Kwek: Gate this--do the block if corresponding Material.json exist
#Kwek: was tempted to do a try-catch, but that is just La-Z
#Kwek: Added another gate for materials
DepotPath=None
Expand All @@ -148,6 +148,7 @@ def CP77GLBimport(self, with_materials, remap_depot, exclude_unused_mats=True, i
matjsonpath = current_file_base_path + ".Material.json"
DepotPath, json_apps, mats = jsonload(matjsonpath)
if DepotPath == None:
print('DepotPath not set')
break

#DepotPath = str(obj["MaterialRepo"]) + "\\"
Expand Down

0 comments on commit a520374

Please sign in to comment.