[Bf-blender-cvs] [4c0ef4f788a] master: Cleanup: Clang tidy fixes

[Hans Goudey]

Commit: 4c0ef4f788a1037888d5cb0a87ac23d6fe84573e
Author: Hans Goudey
Date:   Thu Oct 1 12:45:21 2020 -0500
Branches: master
https://developer.blender.org/rB4c0ef4f788a1037888d5cb0a87ac23d6fe84573e

Cleanup: Clang tidy fixes

Fix a redundant return statement at the end of void function and
an inconsistent declaration parameter names.

===================================================================

M	source/blender/blenkernel/intern/volume_render.cc
M	source/blender/makesdna/DNA_genfile.h

===================================================================

diff --git a/source/blender/blenkernel/intern/volume_render.cc b/source/blender/blenkernel/intern/volume_render.cc
index abbff2f27cf..a4c59cb5046 100644
--- a/source/blender/blenkernel/intern/volume_render.cc
+++ b/source/blender/blenkernel/intern/volume_render.cc
@@ -140,7 +140,6 @@ static void extract_dense_float_voxels(const VolumeGridType grid_type,
       /* Zero channels to copy. */
       break;
   }
-  return;
 }
 
 static void create_texture_to_object_matrix(const openvdb::Mat4d &grid_transform,
diff --git a/source/blender/makesdna/DNA_genfile.h b/source/blender/makesdna/DNA_genfile.h
index b09b6dcd8e4..96766bf16b8 100644
--- a/source/blender/makesdna/DNA_genfile.h
+++ b/source/blender/makesdna/DNA_genfile.h
@@ -106,9 +106,9 @@ int DNA_struct_find_nr(const struct SDNA *sdna, const char *str);
 void DNA_struct_switch_endian(const struct SDNA *oldsdna, int oldSDNAnr, char *data);
 const char *DNA_struct_get_compareflags(const struct SDNA *sdna, const struct SDNA *newsdna);
 void *DNA_struct_reconstruct(const struct DNA_ReconstructInfo *reconstruct_info,
-                             int oldSDNAnr,
+                             int old_struct_nr,
                              int blocks,
-                             const void *data);
+                             const void *old_blocks);
 
 int DNA_elem_offset(struct SDNA *sdna, const char *stype, const char *vartype, const char *name);