Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
mauserzjeh committed Dec 9, 2024
2 parents 79390a3 + d7633fe commit b67ceeb
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"python.analysis.extraPaths": [
"${workspaceFolder}\\python\\cod_asset_importer",
"D:\\CODING\\PERSONAL\\blender_autocomplete\\4.2",
"D:\\PROGRAMS\\STEAM\\steamapps\\common\\Blender\\4.2\\scripts\\modules"
"D:\\PROGRAMS\\STEAM\\steamapps\\common\\Blender\\4.3\\scripts\\modules"
],
"rust-analyzer.linkedProjects": [
".\\rust\\cod_asset_importer\\Cargo.toml",
Expand Down
4 changes: 2 additions & 2 deletions python/cod_asset_importer/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"name": "Call of Duty Asset Importer",
"description": "Import Call of Duty assets",
"author": "Soma Rádóczi",
"version": (3, 4, 0),
"blender": (4, 2, 0),
"version": (3, 5, 0),
"blender": (4, 3, 0),
"location": "File > Import -> CoD Asset Importer",
"category": "Import-Export",
"warning": "This addon is still in development",
Expand Down
3 changes: 0 additions & 3 deletions python/cod_asset_importer/importer.py
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,6 @@ def _import_material_v14(
material = bpy.data.materials.new(material_name)
material.use_nodes = True
material.blend_method = "HASHED"
material.shadow_method = "HASHED"

nodes = material.node_tree.nodes
links = material.node_tree.links
Expand Down Expand Up @@ -360,7 +359,6 @@ def _import_material_v20_v25(self, loaded_material: LoadedMaterial) -> None:
material = bpy.data.materials.new(material_name)
material.use_nodes = True
material.blend_method = "HASHED"
material.shadow_method = "HASHED"

nodes = material.node_tree.nodes
links = material.node_tree.links
Expand Down Expand Up @@ -587,7 +585,6 @@ def _import_material_v62(self, loaded_material: LoadedMaterial) -> None:
material = bpy.data.materials.new(material_name)
material.use_nodes = True
material.blend_method = "HASHED"
material.shadow_method = "HASHED"

nodes = material.node_tree.nodes
links = material.node_tree.links
Expand Down

0 comments on commit b67ceeb

Please sign in to comment.