From 8950d5319b8610e753781077b5a24f46530fe9bd Mon Sep 17 00:00:00 2001 From: Lila Date: Sun, 27 Oct 2024 11:02:02 +0000 Subject: [PATCH 1/9] remove a new line --- fast64_internal/f3d_material_converter.py | 1 - 1 file changed, 1 deletion(-) diff --git a/fast64_internal/f3d_material_converter.py b/fast64_internal/f3d_material_converter.py index fffb903da..9f173af44 100644 --- a/fast64_internal/f3d_material_converter.py +++ b/fast64_internal/f3d_material_converter.py @@ -28,7 +28,6 @@ def upgrade_f3d_version_all_meshes() -> None: for obj in objs: upgradeF3DVersionOneObject(obj, materialDict, f3d_node_tree) - def upgradeF3DVersionOneObject(obj, materialDict, f3d_node_tree: bpy.types.NodeTree): for index in range(len(obj.material_slots)): material = obj.material_slots[index].material From 1ce2e8dee3b93b84c4cc99438292aa317ccc03f6 Mon Sep 17 00:00:00 2001 From: Lila Date: Sun, 27 Oct 2024 11:06:56 +0000 Subject: [PATCH 2/9] second test --- __init__.py | 3 +++ fast64_internal/f3d_material_converter.py | 1 + 2 files changed, 4 insertions(+) diff --git a/__init__.py b/__init__.py index 7473759da..fef32d227 100644 --- a/__init__.py +++ b/__init__.py @@ -494,3 +494,6 @@ def unregister(): addon_updater_ops.unregister() unregister_class(ExampleAddonPreferences) + +new_test_array = [ + "Badly formatted!"] \ No newline at end of file diff --git a/fast64_internal/f3d_material_converter.py b/fast64_internal/f3d_material_converter.py index 9f173af44..fffb903da 100644 --- a/fast64_internal/f3d_material_converter.py +++ b/fast64_internal/f3d_material_converter.py @@ -28,6 +28,7 @@ def upgrade_f3d_version_all_meshes() -> None: for obj in objs: upgradeF3DVersionOneObject(obj, materialDict, f3d_node_tree) + def upgradeF3DVersionOneObject(obj, materialDict, f3d_node_tree: bpy.types.NodeTree): for index in range(len(obj.material_slots)): material = obj.material_slots[index].material From f073bc2c872939b152bfb082e17a681a738728ac Mon Sep 17 00:00:00 2001 From: Lila Date: Sun, 27 Oct 2024 11:08:08 +0000 Subject: [PATCH 3/9] suggestions Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- __init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/__init__.py b/__init__.py index fef32d227..0bb9710b8 100644 --- a/__init__.py +++ b/__init__.py @@ -495,5 +495,5 @@ def unregister(): addon_updater_ops.unregister() unregister_class(ExampleAddonPreferences) -new_test_array = [ - "Badly formatted!"] \ No newline at end of file + +new_test_array = ["Badly formatted!"] \ No newline at end of file From ad4d08edafc4e8fd77a862745bae2fd76877496b Mon Sep 17 00:00:00 2001 From: Lila Date: Sun, 27 Oct 2024 11:28:27 +0000 Subject: [PATCH 4/9] bad --- __init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/__init__.py b/__init__.py index 0bb9710b8..14360e7cf 100644 --- a/__init__.py +++ b/__init__.py @@ -496,4 +496,5 @@ def unregister(): unregister_class(ExampleAddonPreferences) -new_test_array = ["Badly formatted!"] \ No newline at end of file +new_test_array = [ + "Badly formatted!"] \ No newline at end of file From 456968af5cdfeccfaa3082c566312e9398823ccb Mon Sep 17 00:00:00 2001 From: Lila Date: Sun, 27 Oct 2024 11:30:41 +0000 Subject: [PATCH 5/9] Update __init__.py Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- __init__.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/__init__.py b/__init__.py index 14360e7cf..0bb9710b8 100644 --- a/__init__.py +++ b/__init__.py @@ -496,5 +496,4 @@ def unregister(): unregister_class(ExampleAddonPreferences) -new_test_array = [ - "Badly formatted!"] \ No newline at end of file +new_test_array = ["Badly formatted!"] \ No newline at end of file From c6cc3c01363a205e1b7a9350f79b42687d841a9c Mon Sep 17 00:00:00 2001 From: Lila Date: Sun, 27 Oct 2024 11:37:31 +0000 Subject: [PATCH 6/9] Update f3d_material_converter.py --- fast64_internal/f3d_material_converter.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fast64_internal/f3d_material_converter.py b/fast64_internal/f3d_material_converter.py index fffb903da..a6d37a04a 100644 --- a/fast64_internal/f3d_material_converter.py +++ b/fast64_internal/f3d_material_converter.py @@ -22,7 +22,8 @@ def upgrade_f3d_version_all_meshes() -> None: set_best_draw_layer_for_materials() - # Dict of non-f3d materials : converted f3d materials + + #Dict of non-f3d materials : converted f3d materials # handles cases where materials are used in multiple objects materialDict = {} for obj in objs: From 2f15f644b9fe492a1f3a162fcab50a6a1746a468 Mon Sep 17 00:00:00 2001 From: Lila Date: Sun, 27 Oct 2024 11:48:32 +0000 Subject: [PATCH 7/9] black --- __init__.py | 2 +- fast64_internal/f3d_material_converter.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/__init__.py b/__init__.py index 0bb9710b8..d8b60bbdd 100644 --- a/__init__.py +++ b/__init__.py @@ -496,4 +496,4 @@ def unregister(): unregister_class(ExampleAddonPreferences) -new_test_array = ["Badly formatted!"] \ No newline at end of file +new_test_array = ["Badly formatted!"] diff --git a/fast64_internal/f3d_material_converter.py b/fast64_internal/f3d_material_converter.py index a6d37a04a..fffb903da 100644 --- a/fast64_internal/f3d_material_converter.py +++ b/fast64_internal/f3d_material_converter.py @@ -22,8 +22,7 @@ def upgrade_f3d_version_all_meshes() -> None: set_best_draw_layer_for_materials() - - #Dict of non-f3d materials : converted f3d materials + # Dict of non-f3d materials : converted f3d materials # handles cases where materials are used in multiple objects materialDict = {} for obj in objs: From 5a080600786e97c874b8578eb126a31bbe02b840 Mon Sep 17 00:00:00 2001 From: Lila Date: Sun, 27 Oct 2024 11:57:29 +0000 Subject: [PATCH 8/9] Update f3d_material_converter.py --- fast64_internal/f3d_material_converter.py | 1 + 1 file changed, 1 insertion(+) diff --git a/fast64_internal/f3d_material_converter.py b/fast64_internal/f3d_material_converter.py index fffb903da..59dceee3d 100644 --- a/fast64_internal/f3d_material_converter.py +++ b/fast64_internal/f3d_material_converter.py @@ -29,6 +29,7 @@ def upgrade_f3d_version_all_meshes() -> None: upgradeF3DVersionOneObject(obj, materialDict, f3d_node_tree) + def upgradeF3DVersionOneObject(obj, materialDict, f3d_node_tree: bpy.types.NodeTree): for index in range(len(obj.material_slots)): material = obj.material_slots[index].material From 0df994cbefc2529e97f408e5509c258053872aa1 Mon Sep 17 00:00:00 2001 From: Lila Date: Sun, 27 Oct 2024 11:58:10 +0000 Subject: [PATCH 9/9] Update fast64_internal/f3d_material_converter.py Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- fast64_internal/f3d_material_converter.py | 1 - 1 file changed, 1 deletion(-) diff --git a/fast64_internal/f3d_material_converter.py b/fast64_internal/f3d_material_converter.py index 59dceee3d..fffb903da 100644 --- a/fast64_internal/f3d_material_converter.py +++ b/fast64_internal/f3d_material_converter.py @@ -29,7 +29,6 @@ def upgrade_f3d_version_all_meshes() -> None: upgradeF3DVersionOneObject(obj, materialDict, f3d_node_tree) - def upgradeF3DVersionOneObject(obj, materialDict, f3d_node_tree: bpy.types.NodeTree): for index in range(len(obj.material_slots)): material = obj.material_slots[index].material