Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Goudey <h.goudey@me.com>2020-10-01 20:45:21 +0300
committerHans Goudey <h.goudey@me.com>2020-10-01 20:45:21 +0300
commit4c0ef4f788a1037888d5cb0a87ac23d6fe84573e (patch)
treedfa3787298e91c30b731cc0b385d93ef4442ce03
parentb6f15d5d47bfdc1b24d5b17e46bac280d8b9a63d (diff)
Cleanup: Clang tidy fixes
Fix a redundant return statement at the end of void function and an inconsistent declaration parameter names.
-rw-r--r--source/blender/blenkernel/intern/volume_render.cc1
-rw-r--r--source/blender/makesdna/DNA_genfile.h4
2 files changed, 2 insertions, 3 deletions
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);