From af91b3dd724248bf98133b96d7b09929dc5b6b9e Mon Sep 17 00:00:00 2001 From: Harley Acheson Date: Wed, 4 Oct 2023 12:12:31 -0700 Subject: [PATCH 1/3] Cleanup: Make format Just formatting changes from Make Format --- source/blender/editors/space_node/drawnode.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/blender/editors/space_node/drawnode.cc b/source/blender/editors/space_node/drawnode.cc index a1e83ed6618..b58190ec80c 100644 --- a/source/blender/editors/space_node/drawnode.cc +++ b/source/blender/editors/space_node/drawnode.cc @@ -1513,7 +1513,7 @@ static void std_node_socket_interface_draw(ID *id, const bNodeTree *node_tree = reinterpret_cast(id); if (interface_socket->flag & NODE_INTERFACE_SOCKET_INPUT && node_tree->type == NTREE_GEOMETRY) { uiItemR(col, &ptr, "hide_in_modifier", DEFAULT_FLAGS, nullptr, ICON_NONE); - if(bke::anonymous_attribute_inferencing::is_possible_field_socket(type)) { + if (bke::anonymous_attribute_inferencing::is_possible_field_socket(type)) { uiItemR(col, &ptr, "force_non_field", DEFAULT_FLAGS, nullptr, ICON_NONE); } } From 6f6fd99dbb49a6013ff3e1daffbdf5c2022c58ec Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Wed, 4 Oct 2023 16:13:56 +0200 Subject: [PATCH 2/3] Fix I/O debug message printed without debugging enabled --- source/blender/blenloader/intern/writefile.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/source/blender/blenloader/intern/writefile.cc b/source/blender/blenloader/intern/writefile.cc index c0a0eb59349..d8fa94a2f36 100644 --- a/source/blender/blenloader/intern/writefile.cc +++ b/source/blender/blenloader/intern/writefile.cc @@ -1432,7 +1432,10 @@ static void write_file_main_validate_pre(Main *bmain, ReportList *reports) return; } - BKE_report(reports, RPT_DEBUG, "Checking validity of current .blend file *BEFORE* save to disk"); + if (G.debug & G_DEBUG_IO) { + BKE_report( + reports, RPT_DEBUG, "Checking validity of current .blend file *BEFORE* save to disk"); + } BLO_main_validate_shapekeys(bmain, reports); if (!BKE_main_namemap_validate_and_fix(bmain)) { From 61f982f0d1474bb8e44a0cd6045af2206f2cfb88 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Wed, 4 Oct 2023 17:19:22 +0200 Subject: [PATCH 3/3] Cleanup: make format --- scripts/startup/bl_operators/anim.py | 10 +++++----- tests/python/bl_blendfile_versioning.py | 5 ++++- tools/utils_maintenance/code_clean.py | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/scripts/startup/bl_operators/anim.py b/scripts/startup/bl_operators/anim.py index 312351ed1d4..d2acff34cd1 100644 --- a/scripts/startup/bl_operators/anim.py +++ b/scripts/startup/bl_operators/anim.py @@ -449,22 +449,22 @@ class ARMATURE_OT_sync_bone_color_to_selected(Operator): return context.mode in {'EDIT_ARMATURE', 'POSE'} def execute(self, context): - match (self.bone_type, context.mode): + match(self.bone_type, context.mode): # Armature in edit mode: - case ('POSE', 'EDIT_ARMATURE'): + case('POSE', 'EDIT_ARMATURE'): self.report({'ERROR'}, "Go to pose mode to copy pose bone colors") return {'OPERATOR_CANCELLED'} - case ('EDIT', 'EDIT_ARMATURE'): + case('EDIT', 'EDIT_ARMATURE'): bone_source = context.active_bone bones_dest = context.selected_bones pose_bones_to_check = [] # Armature in pose mode: - case ('POSE', 'POSE'): + case('POSE', 'POSE'): bone_source = context.active_pose_bone bones_dest = context.selected_pose_bones pose_bones_to_check = [] - case ('EDIT', 'POSE'): + case('EDIT', 'POSE'): bone_source = context.active_bone pose_bones_to_check = context.selected_pose_bones bones_dest = [posebone.bone for posebone in pose_bones_to_check] diff --git a/tests/python/bl_blendfile_versioning.py b/tests/python/bl_blendfile_versioning.py index d1e0859725c..d704f8c7cb8 100644 --- a/tests/python/bl_blendfile_versioning.py +++ b/tests/python/bl_blendfile_versioning.py @@ -24,7 +24,10 @@ class TestBlendFileOpenAllTestFiles(TestHelper): "explode_modifier.blend", # tests/depsgraph/deg_anim_camera_dof_driving_material.blend - # ERROR (bke.fcurve): source/blender/blenkernel/intern/fcurve_driver.cc:188 dtar_get_prop_val: Driver Evaluation Error: cannot resolve target for OBCamera -> data.dof_distance + # ERROR (bke.fcurve): + # source/blender/blenkernel/intern/fcurve_driver.cc:188 dtar_get_prop_val: + # Driver Evaluation Error: cannot resolve target for OBCamera -> + # data.dof_distance "deg_anim_camera_dof_driving_material.blend", # tests/depsgraph/deg_driver_shapekey_same_datablock.blend diff --git a/tools/utils_maintenance/code_clean.py b/tools/utils_maintenance/code_clean.py index f98196719c1..6dbf37f0c3a 100755 --- a/tools/utils_maintenance/code_clean.py +++ b/tools/utils_maintenance/code_clean.py @@ -2135,7 +2135,7 @@ def main() -> int: verbose_edit_actions = False verbose_all_from_args = args.verbose.split(",") if args.verbose else [] while verbose_all_from_args: - match (verbose_id := verbose_all_from_args.pop()): + match(verbose_id := verbose_all_from_args.pop()): case "compile": verbose_compile = True case "edit_actions":