Commit: 8c194e1ba6aefa0cffafcc7edccb47f8ba8589c0 Author: Chris Blackbourn Date: Thu Dec 29 20:49:08 2022 +1300 Branches: master https://developer.blender.org/rB8c194e1ba6aefa0cffafcc7edccb47f8ba8589c0
Cleanup: format =================================================================== M source/blender/blenkernel/BKE_image_partial_update.hh M source/blender/editors/mesh/editmesh_mask_extract.c M source/blender/gpencil_modifiers/intern/lineart/lineart_shadow.c M source/blender/gpu/intern/gpu_codegen.cc M source/blender/modifiers/intern/MOD_util.cc M source/blender/nodes/intern/node_socket.cc M source/blender/nodes/texture/node_texture_util.cc M tests/python/bl_blendfile_io.py M tests/python/modifiers.py =================================================================== diff --git a/source/blender/blenkernel/BKE_image_partial_update.hh b/source/blender/blenkernel/BKE_image_partial_update.hh index 6c7776c091c..8f962ace268 100644 --- a/source/blender/blenkernel/BKE_image_partial_update.hh +++ b/source/blender/blenkernel/BKE_image_partial_update.hh @@ -29,7 +29,6 @@ struct PartialUpdateUser; namespace blender::bke::image { - namespace partial_update { /* --- image_partial_update.cc --- */ diff --git a/source/blender/editors/mesh/editmesh_mask_extract.c b/source/blender/editors/mesh/editmesh_mask_extract.c index bb4d745a677..9988bdcb367 100644 --- a/source/blender/editors/mesh/editmesh_mask_extract.c +++ b/source/blender/editors/mesh/editmesh_mask_extract.c @@ -293,7 +293,7 @@ static int paint_mask_extract_exec(bContext *C, wmOperator *op) * Note: A second push happens after the operator due to * the OPTYPE_UNDO flag; having an initial undo step here * is just needed to preserve the active object pointer. - * + * * Fixes T103261. */ ED_undo_push_op(C, op); diff --git a/source/blender/gpencil_modifiers/intern/lineart/lineart_shadow.c b/source/blender/gpencil_modifiers/intern/lineart/lineart_shadow.c index 7ac1ecb3796..26352f8ed54 100644 --- a/source/blender/gpencil_modifiers/intern/lineart/lineart_shadow.c +++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_shadow.c @@ -588,7 +588,7 @@ static void lineart_shadow_edge_cut(LineartData *ld, new_seg_2->ratio = end; } - double r_fb_co_1[4]={0}, r_fb_co_2[4]={0}, r_gloc_1[3]={0}, r_gloc_2[3]={0}; + double r_fb_co_1[4] = {0}, r_fb_co_2[4] = {0}, r_gloc_1[3] = {0}, r_gloc_2[3] = {0}; double r_new_in_the_middle[4], r_new_in_the_middle_global[3], r_new_at; double *s1_fb_co_1, *s1_fb_co_2, *s1_gloc_1, *s1_gloc_2; diff --git a/source/blender/gpu/intern/gpu_codegen.cc b/source/blender/gpu/intern/gpu_codegen.cc index c4c0e403af1..465a621e864 100644 --- a/source/blender/gpu/intern/gpu_codegen.cc +++ b/source/blender/gpu/intern/gpu_codegen.cc @@ -211,7 +211,8 @@ static std::ostream &operator<<(std::ostream &stream, const GPUOutput *output) } /* Trick type to change overload and keep a somewhat nice syntax. */ -struct GPUConstant : public GPUInput {}; +struct GPUConstant : public GPUInput { +}; /* Print data constructor (i.e: vec2(1.0f, 1.0f)). */ static std::ostream &operator<<(std::ostream &stream, const GPUConstant *input) diff --git a/source/blender/modifiers/intern/MOD_util.cc b/source/blender/modifiers/intern/MOD_util.cc index 6b7072db121..844e2d19a58 100644 --- a/source/blender/modifiers/intern/MOD_util.cc +++ b/source/blender/modifiers/intern/MOD_util.cc @@ -40,7 +40,6 @@ #include "MEM_guardedalloc.h" - void MOD_init_texture(MappingInfoModifierData *dmd, const ModifierEvalContext *ctx) { Tex *tex = dmd->texture; diff --git a/source/blender/nodes/intern/node_socket.cc b/source/blender/nodes/intern/node_socket.cc index e179740aafb..8f2c36152c5 100644 --- a/source/blender/nodes/intern/node_socket.cc +++ b/source/blender/nodes/intern/node_socket.cc @@ -482,7 +482,6 @@ void node_socket_copy_default_value(bNodeSocket *to, const bNodeSocket *from) to->flag |= (from->flag & SOCK_HIDE_VALUE); } - static void standard_node_socket_interface_init_socket(bNodeTree * /*ntree*/, const bNodeSocket *interface_socket, bNode * /*node*/, diff --git a/source/blender/nodes/texture/node_texture_util.cc b/source/blender/nodes/texture/node_texture_util.cc index 2c2f14d0316..46d8417bfce 100644 --- a/source/blender/nodes/texture/node_texture_util.cc +++ b/source/blender/nodes/texture/node_texture_util.cc @@ -23,7 +23,9 @@ #include "node_texture_util.hh" -bool tex_node_poll_default(const bNodeType * /*ntype*/, const bNodeTree *ntree, const char **r_disabled_hint) +bool tex_node_poll_default(const bNodeType * /*ntype*/, + const bNodeTree *ntree, + const char **r_disabled_hint) { if (!STREQ(ntree->idname, "TextureNodeTree")) { *r_disabled_hint = TIP_("Not a texture node tree"); diff --git a/tests/python/bl_blendfile_io.py b/tests/python/bl_blendfile_io.py index ae49afdfadb..8495c8a7ad6 100644 --- a/tests/python/bl_blendfile_io.py +++ b/tests/python/bl_blendfile_io.py @@ -65,7 +65,7 @@ class TestIdRuntimeTag(TestHelper): obj = bpy.data.objects['Cube'] assert obj.is_runtime_data == False - assert bpy.context.view_layer.depsgraph.ids['Cube'].is_runtime_data == True + assert bpy.context.view_layer.depsgraph.ids['Cube'].is_runtime_data output_work_path = os.path.join(output_dir, self.unique_blendfile_name("blendfile")) bpy.ops.wm.save_as_mainfile(filepath=output_work_path, check_existing=False, compress=False) @@ -75,7 +75,7 @@ class TestIdRuntimeTag(TestHelper): assert obj.is_runtime_data == False obj.is_runtime_data = True - assert obj.is_runtime_data == True + assert obj.is_runtime_data bpy.ops.wm.save_as_mainfile(filepath=output_work_path, check_existing=False, compress=False) bpy.ops.wm.open_mainfile(filepath=output_work_path, load_ui=False) @@ -116,7 +116,7 @@ class TestIdRuntimeTag(TestHelper): # Only usage of this linked material is a runtime ID (object), # so writing .blend file will have properly reset its tag to indirectly linked data. - assert linked_material.is_library_indirect == True + assert linked_material.is_library_indirect bpy.ops.wm.open_mainfile(filepath=output_work_path, load_ui=False) diff --git a/tests/python/modifiers.py b/tests/python/modifiers.py index f16d91d41f9..a4196b44fd4 100644 --- a/tests/python/modifiers.py +++ b/tests/python/modifiers.py @@ -30,6 +30,7 @@ def cube_mask_first_modifier_list(): ] return generate_modifiers + def cube_random_modifier_list(): generate_modifiers = [ ModifierSpec('edge split', 'EDGE_SPLIT', {}), @@ -46,6 +47,7 @@ def cube_random_modifier_list(): ] return generate_modifiers + def main(): tests = [ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs