diff --git a/.clang-tidy b/.clang-tidy
index f392527de5f..d96ad4feba0 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -47,7 +47,7 @@ Checks:  >
   -modernize-pass-by-value,
   -modernize-raw-string-literal,
   -modernize-return-braced-init-list,
-  
+
   objc-*
 
 CheckOptions:
diff --git a/build_files/build_environment/cmake/shaderc_deps.cmake b/build_files/build_environment/cmake/shaderc_deps.cmake
index bf884c27790..ab04624d3c4 100644
--- a/build_files/build_environment/cmake/shaderc_deps.cmake
+++ b/build_files/build_environment/cmake/shaderc_deps.cmake
@@ -30,7 +30,7 @@ ExternalProject_Add(external_shaderc_spirv_tools
   URL_HASH ${SHADERC_SPIRV_TOOLS_HASH_TYPE}=${SHADERC_SPIRV_TOOLS_HASH}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   PREFIX ${BUILD_DIR}/shaderc_spirv_tools
-  
+
   PATCH_COMMAND COMMAND ${PATCH_CMD} -p 1 -d
     ${BUILD_DIR}/shaderc_spirv_tools/src/external_shaderc_spirv_tools <
     ${PATCH_DIR}/shaderc_spirv_tools_5805.diff
diff --git a/build_files/buildbot/config/blender_windows.cmake b/build_files/buildbot/config/blender_windows.cmake
index 19c3e0decf3..49c6692045f 100644
--- a/build_files/buildbot/config/blender_windows.cmake
+++ b/build_files/buildbot/config/blender_windows.cmake
@@ -6,4 +6,4 @@ include("${CMAKE_CURRENT_LIST_DIR}/../../cmake/config/blender_release.cmake")
 
 set(WITH_CYCLES_TEST_OSL     ON CACHE BOOL "" FORCE)
 
-set(HIPRT_COMPILER_PARALLEL_JOBS 4 CACHE STRING "" FORCE)
\ No newline at end of file
+set(HIPRT_COMPILER_PARALLEL_JOBS 4 CACHE STRING "" FORCE)
diff --git a/source/blender/blenkernel/intern/asset_edit.cc b/source/blender/blenkernel/intern/asset_edit.cc
index 7c0214e0ace..02cee89a6b5 100644
--- a/source/blender/blenkernel/intern/asset_edit.cc
+++ b/source/blender/blenkernel/intern/asset_edit.cc
@@ -129,10 +129,11 @@ static std::string asset_blendfile_path_for_save(const bUserAssetLibrary &user_l
               std::min(sizeof(base_name_filesafe), size_t(base_name.size() + 1)));
   BLI_path_make_safe_filename(base_name_filesafe);
 
-  const std::string filepath = root_path + SEP + base_name_filesafe + BLENDER_ASSET_FILE_SUFFIX;
-
-  if (!BLI_is_file(filepath.c_str())) {
-    return filepath;
+  {
+    const std::string filepath = root_path + SEP + base_name_filesafe + BLENDER_ASSET_FILE_SUFFIX;
+    if (!BLI_is_file(filepath.c_str())) {
+      return filepath;
+    }
   }
 
   /* Avoid overwriting existing file by adding number suffix. */
diff --git a/source/blender/editors/include/UI_interface_c.hh b/source/blender/editors/include/UI_interface_c.hh
index b7ce470ee5c..55c9096365e 100644
--- a/source/blender/editors/include/UI_interface_c.hh
+++ b/source/blender/editors/include/UI_interface_c.hh
@@ -1782,7 +1782,7 @@ void UI_but_search_preview_grid_size_set(uiBut *but, int rows, int cols);
 
 void UI_but_view_item_draw_size_set(uiBut *but,
                                     const std::optional<int> draw_width = std::nullopt,
-                                    const std::optional<int> draw_heigh = std::nullopt);
+                                    const std::optional<int> draw_height = std::nullopt);
 
 void UI_block_func_handle_set(uiBlock *block, uiBlockHandleFunc func, void *arg);
 void UI_block_func_set(uiBlock *block, uiButHandleFunc func, void *arg1, void *arg2);
diff --git a/source/blender/editors/include/UI_tree_view.hh b/source/blender/editors/include/UI_tree_view.hh
index cf8d0b891bd..1f6687b2af4 100644
--- a/source/blender/editors/include/UI_tree_view.hh
+++ b/source/blender/editors/include/UI_tree_view.hh
@@ -141,7 +141,7 @@ class AbstractTreeView : public AbstractView, public TreeViewItemContainer {
    * are fewer items, empty dummy items will be added. These contribute to the view bounds, so the
    * drop target of the view includes them, but they are not interactive (e.g. no mouse-hover
    * highlight). */
-  void set_default_rows(int min_rows);
+  void set_default_rows(int default_rows);
 
  protected:
   virtual void build_tree() = 0;