From c8efea42e132b892cd53a89a51ef2a5f9deee648 Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Thu, 7 Mar 2024 09:30:15 -0500 Subject: [PATCH] Cleanup: Remove unnecessary braces for container default constructors These containers (Set, Vector, Map, Span), etc. have default constructors, making the braces unnecessary for default initialization. Better to depend on that consistently rather than having braces in some places and not others. --- source/blender/asset_system/intern/asset_storage.cc | 2 +- source/blender/blendthumb/src/blendthumb_png.cc | 8 ++++---- source/blender/blenkernel/intern/curve_to_mesh_convert.cc | 2 +- source/blender/blenkernel/intern/lib_query.cc | 2 +- .../blender/draw/engines/workbench/workbench_private.hh | 4 ++-- .../blender/draw/engines/workbench/workbench_resources.cc | 2 +- source/blender/draw/engines/workbench/workbench_shadow.cc | 4 ++-- .../tree/tree_display_override_library_hierarchies.cc | 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/source/blender/asset_system/intern/asset_storage.cc b/source/blender/asset_system/intern/asset_storage.cc index 02db8550e4c..672892dfea6 100644 --- a/source/blender/asset_system/intern/asset_storage.cc +++ b/source/blender/asset_system/intern/asset_storage.cc @@ -45,7 +45,7 @@ bool AssetStorage::remove_asset(AssetRepresentation &asset) void AssetStorage::remap_ids_and_remove_invalid(const blender::bke::id::IDRemapper &mappings) { - Set removed_assets{}; + Set removed_assets; for (auto &asset_ptr : local_id_assets_) { AssetRepresentation &asset = *asset_ptr; diff --git a/source/blender/blendthumb/src/blendthumb_png.cc b/source/blender/blendthumb/src/blendthumb_png.cc index bfc448a5d0d..4b979fd776a 100644 --- a/source/blender/blendthumb/src/blendthumb_png.cc +++ b/source/blender/blendthumb/src/blendthumb_png.cc @@ -49,7 +49,7 @@ static blender::Vector filtered_rows_from_thumb(const Thumbnail *thumb) /* In the image data sent to the compression step, each scan-line is preceded by a filter type * byte containing the numeric code of the filter algorithm used for that scan-line. */ const size_t line_size = thumb->width * 4; - blender::Vector filtered{}; + blender::Vector filtered; size_t final_size = thumb->height * (line_size + 1); filtered.reserve(final_size); for (int i = 0; i < thumb->height; i++) { @@ -88,7 +88,7 @@ std::optional> blendthumb_create_png_data_from_thumb( } /* Create `IDAT` chunk data. */ - blender::Vector image_data{}; + blender::Vector image_data; { auto image_data_opt = zlib_compress(filtered_rows_from_thumb(thumb)); if (image_data_opt == std::nullopt) { @@ -98,7 +98,7 @@ std::optional> blendthumb_create_png_data_from_thumb( } /* Create the IHDR chunk data. */ - blender::Vector ihdr_data{}; + blender::Vector ihdr_data; { const size_t ihdr_data_final_size = 4 + 4 + 5; ihdr_data.reserve(ihdr_data_final_size); @@ -115,7 +115,7 @@ std::optional> blendthumb_create_png_data_from_thumb( } /* Join it all together to create a PNG image. */ - blender::Vector png_buf{}; + blender::Vector png_buf; { const size_t png_buf_final_size = ( /* Header. */ diff --git a/source/blender/blenkernel/intern/curve_to_mesh_convert.cc b/source/blender/blenkernel/intern/curve_to_mesh_convert.cc index 86abea04b4c..98e85c8c370 100644 --- a/source/blender/blenkernel/intern/curve_to_mesh_convert.cc +++ b/source/blender/blenkernel/intern/curve_to_mesh_convert.cc @@ -474,7 +474,7 @@ static void build_mesh_positions(const CurvesInfo &curves_info, } const Span tangents = curves_info.main.evaluated_tangents(); const Span normals = curves_info.main.evaluated_normals(); - Span radii_eval = {}; + Span radii_eval; if (const GVArray radii = *curves_info.main.attributes().lookup("radius", AttrDomain::Point)) { radii_eval = evaluate_attribute(radii, curves_info.main, eval_buffer).typed(); } diff --git a/source/blender/blenkernel/intern/lib_query.cc b/source/blender/blenkernel/intern/lib_query.cc index d5e6beb8b01..530e3d05b6c 100644 --- a/source/blender/blenkernel/intern/lib_query.cc +++ b/source/blender/blenkernel/intern/lib_query.cc @@ -616,7 +616,7 @@ struct UnusedIDsData { std::array *num_local; std::array *num_linked; - blender::Set unused_ids{}; + blender::Set unused_ids; UnusedIDsData(Main *bmain, const int id_tag, LibQueryUnusedIDsData ¶meters) : bmain(bmain), diff --git a/source/blender/draw/engines/workbench/workbench_private.hh b/source/blender/draw/engines/workbench/workbench_private.hh index 401a4428f15..66b82046896 100644 --- a/source/blender/draw/engines/workbench/workbench_private.hh +++ b/source/blender/draw/engines/workbench/workbench_private.hh @@ -158,7 +158,7 @@ struct SceneState { bool xray_mode = false; DRWState cull_state = DRW_STATE_NO_DRAW; - Vector clip_planes = {}; + Vector clip_planes; float4 background_color = float4(0); @@ -293,7 +293,7 @@ class MeshPass : public PassMain { private: using TextureSubPassKey = std::pair; - Map texture_subpass_map_ = {}; + Map texture_subpass_map_; PassMain::Sub *passes_[geometry_type_len][shader_type_len] = {{nullptr}}; diff --git a/source/blender/draw/engines/workbench/workbench_resources.cc b/source/blender/draw/engines/workbench/workbench_resources.cc index 73eced5d34a..d423776a2bc 100644 --- a/source/blender/draw/engines/workbench/workbench_resources.cc +++ b/source/blender/draw/engines/workbench/workbench_resources.cc @@ -21,7 +21,7 @@ static bool get_matcap_tx(Texture &matcap_tx, StudioLight &studio_light) if (matcap_diffuse && matcap_diffuse->float_buffer.data) { int layers = 1; float *buffer = matcap_diffuse->float_buffer.data; - Vector combined_buffer = {}; + Vector combined_buffer; if (matcap_specular && matcap_specular->float_buffer.data) { int size = matcap_diffuse->x * matcap_diffuse->y * 4; diff --git a/source/blender/draw/engines/workbench/workbench_shadow.cc b/source/blender/draw/engines/workbench/workbench_shadow.cc index c8ba56067e1..a46d1f697e7 100644 --- a/source/blender/draw/engines/workbench/workbench_shadow.cc +++ b/source/blender/draw/engines/workbench/workbench_shadow.cc @@ -96,8 +96,8 @@ void ShadowPass::ShadowView::setup(View &view, float3 light_direction, bool forc float4 frustum_planes[6]; DRW_culling_frustum_planes_get(nullptr, (float(*)[4])frustum_planes); - Vector faces_result = {}; - Vector corners_result = {}; + Vector faces_result; + Vector corners_result; /* "Unlit" frustum faces are left "as-is" */ diff --git a/source/blender/editors/space_outliner/tree/tree_display_override_library_hierarchies.cc b/source/blender/editors/space_outliner/tree/tree_display_override_library_hierarchies.cc index df3878f64d8..430be729db5 100644 --- a/source/blender/editors/space_outliner/tree/tree_display_override_library_hierarchies.cc +++ b/source/blender/editors/space_outliner/tree/tree_display_override_library_hierarchies.cc @@ -100,10 +100,10 @@ class OverrideIDHierarchyBuilder { const ID &override_root_id_; /* The ancestor IDs leading to the current ID, to avoid IDs recursing into themselves. Changes * with every level of recursion. */ - Set parent_ids{}; + Set parent_ids; /* The IDs that were already added to #parent_te, to avoid duplicates. Entirely new set with * every level of recursion. */ - Set sibling_ids{}; + Set sibling_ids; }; public: