diff options
author | Campbell Barton <campbell@blender.org> | 2022-08-30 09:15:45 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-08-30 09:22:49 +0300 |
commit | 24b8ccaa94a66a3552dc7100996d83d492a55ada (patch) | |
tree | 604d44f886ab80f875d90affd41b651eeb37e8a3 | |
parent | 26487530f2c20c5e440ed620d87ff6e27b6e0dd7 (diff) |
Cleanup: format
-rw-r--r-- | intern/cycles/kernel/svm/musgrave.h | 3 | ||||
-rw-r--r-- | release/scripts/modules/bl_i18n_utils/bl_extract_messages.py | 15 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_userpref.py | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/node.cc | 6 | ||||
-rw-r--r-- | source/blender/blenlib/BLI_virtual_array.hh | 9 | ||||
-rw-r--r-- | source/blender/gpu/metal/mtl_query.mm | 4 |
6 files changed, 27 insertions, 12 deletions
diff --git a/intern/cycles/kernel/svm/musgrave.h b/intern/cycles/kernel/svm/musgrave.h index e88da8a17f7..8bf172f0981 100644 --- a/intern/cycles/kernel/svm/musgrave.h +++ b/intern/cycles/kernel/svm/musgrave.h @@ -472,7 +472,6 @@ ccl_device_noinline_cpu float noise_musgrave_hybrid_multi_fractal_3d( float value = 0.0f; float weight = 1.0f; - for (int i = 0; (weight > 0.001f) && (i < float_to_int(octaves)); i++) { if (weight > 1.0f) { weight = 1.0f; @@ -486,7 +485,7 @@ ccl_device_noinline_cpu float noise_musgrave_hybrid_multi_fractal_3d( } float rmd = octaves - floorf(octaves); - if ((rmd != 0.0f) && (weight > 0.001f)){ + if ((rmd != 0.0f) && (weight > 0.001f)) { if (weight > 1.0f) { weight = 1.0f; } diff --git a/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py b/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py index 683ca2bc5fe..dea538af39b 100644 --- a/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py +++ b/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py @@ -97,7 +97,7 @@ def check(check_ctxt, msgs, key, msgsrc, settings): if key in py_in_rna[1]: py_in_rna[0].add(key) if not_capitalized is not None: - if(key[1] not in settings.WARN_MSGID_NOT_CAPITALIZED_ALLOWED and + if (key[1] not in settings.WARN_MSGID_NOT_CAPITALIZED_ALLOWED and key[1][0].isalpha() and not key[1][0].isupper()): not_capitalized.add(key) if end_point is not None: @@ -909,7 +909,18 @@ def dump_template_messages(msgs, reports, settings): def dump_addon_bl_info(msgs, reports, module, settings): for prop in ('name', 'location', 'description'): - process_msg(msgs, settings.DEFAULT_CONTEXT, module.bl_info[prop], "Add-on " + module.bl_info['name'] + " info: " + prop, reports, None, settings) + process_msg( + msgs, + settings.DEFAULT_CONTEXT, + module.bl_info[prop], + "Add-on " + + module.bl_info['name'] + + " info: " + + prop, + reports, + None, + settings, + ) ##### Main functions! ##### diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index 1b71b503eb7..ed014b57aa4 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -1933,7 +1933,7 @@ class USERPREF_PT_addons(AddOnPanel, Panel): (info["author"] and (search in info["author"].lower())) or ((filter == "All") and (search in info["category"].lower() or search in iface_(info["category"]).lower())) - ): + ): continue # Addon UI Code diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc index 9b28568aaf7..4ed2885dd90 100644 --- a/source/blender/blenkernel/intern/node.cc +++ b/source/blender/blenkernel/intern/node.cc @@ -3383,8 +3383,10 @@ struct bNodeSocket *ntreeAddSocketInterfaceFromSocket(bNodeTree *ntree, bNode *from_node, bNodeSocket *from_sock) { - bNodeSocket *iosock = ntreeAddSocketInterface( - ntree, static_cast<eNodeSocketInOut>(from_sock->in_out), from_sock->idname, DATA_(from_sock->name)); + bNodeSocket *iosock = ntreeAddSocketInterface(ntree, + static_cast<eNodeSocketInOut>(from_sock->in_out), + from_sock->idname, + DATA_(from_sock->name)); if (iosock) { if (iosock->typeinfo->interface_from_socket) { iosock->typeinfo->interface_from_socket(ntree, iosock, from_node, from_sock); diff --git a/source/blender/blenlib/BLI_virtual_array.hh b/source/blender/blenlib/BLI_virtual_array.hh index 4784114c88a..19ee2334bd9 100644 --- a/source/blender/blenlib/BLI_virtual_array.hh +++ b/source/blender/blenlib/BLI_virtual_array.hh @@ -876,9 +876,12 @@ template<typename T> class VMutableArray; * construct the virtual array first and then move it into the vector. */ namespace varray_tag { -struct span {}; -struct single_ref {}; -struct single {}; +struct span { +}; +struct single_ref { +}; +struct single { +}; } // namespace varray_tag /** diff --git a/source/blender/gpu/metal/mtl_query.mm b/source/blender/gpu/metal/mtl_query.mm index 73e5f72dc5b..8983ea7ec44 100644 --- a/source/blender/gpu/metal/mtl_query.mm +++ b/source/blender/gpu/metal/mtl_query.mm @@ -30,8 +30,8 @@ void MTLQueryPool::allocate_buffer() { /* Allocate Metal buffer for visibility results. */ size_t buffer_size_in_bytes = VISIBILITY_COUNT_PER_BUFFER * VISIBILITY_RESULT_SIZE_IN_BYTES; - gpu::MTLBuffer *buffer = MTLContext::get_global_memory_manager().allocate( - buffer_size_in_bytes, true); + gpu::MTLBuffer *buffer = MTLContext::get_global_memory_manager().allocate(buffer_size_in_bytes, + true); BLI_assert(buffer); buffer_.append(buffer); } |