Cleanup: Clang tidy

Mainly duplicate includes and else after return.

2 files changed, 4 insertions, 6 deletions

diff --git a/source/blender/io/usd/intern/usd_reader_mesh.cc b/source/blender/io/usd/intern/usd_reader_mesh.cc
index 36e1a40953c..46749b03169 100644
--- a/source/blender/io/usd/intern/usd_reader_mesh.cc
+++ b/source/blender/io/usd/intern/usd_reader_mesh.cc
@@ -87,11 +87,9 @@ static Material *find_existing_material(
       if (mat_iter != mat_map.end()) {
         return mat_iter->second;
       }
-      else {
-        /* We can't find the Blender material which was previously created for this USD
-         * material, which should never happen.  */
-        BLI_assert_unreachable();
-      }
+      /* We can't find the Blender material which was previously created for this USD
+       * material, which should never happen.  */
+      BLI_assert_unreachable();
     }
   }
   else {
diff --git a/source/blender/io/usd/intern/usd_writer_volume.cc b/source/blender/io/usd/intern/usd_writer_volume.cc
index 4126be6966a..6300e5c657c 100644
--- a/source/blender/io/usd/intern/usd_writer_volume.cc
+++ b/source/blender/io/usd/intern/usd_writer_volume.cc
@@ -100,7 +100,7 @@ std::optional<std::string> USDVolumeWriter::resolve_vdb_file(const Volume *volum
 
     vdb_file_path = construct_vdb_file_path(volume);
     if (!BKE_volume_save(
-            volume, usd_export_context_.bmain, NULL, vdb_file_path.value_or("").c_str())) {
+            volume, usd_export_context_.bmain, nullptr, vdb_file_path.value_or("").c_str())) {
       return std::nullopt;
     }
   }