From 3d3bc748849834ef74563deb603ab43859cffeeb Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 7 Jan 2022 11:38:08 +1100 Subject: Cleanup: remove redundant const qualifiers for POD types MSVC used to warn about const mismatch for arguments passed by value. Remove these as newer versions of MSVC no longer show this warning. --- source/blender/blenloader/intern/readfile.h | 2 +- source/blender/blenloader/intern/versioning_common.h | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) (limited to 'source/blender/blenloader/intern') diff --git a/source/blender/blenloader/intern/readfile.h b/source/blender/blenloader/intern/readfile.h index 3b5be3dd013..21b0354b097 100644 --- a/source/blender/blenloader/intern/readfile.h +++ b/source/blender/blenloader/intern/readfile.h @@ -200,7 +200,7 @@ struct AssetMetaData *blo_bhead_id_asset_data_address(const FileData *fd, const * * \attention ONLY USE THIS KIND OF VERSIONING WHEN `dna_rename_defs.h` ISN'T SUFFICIENT. */ -void blo_do_versions_dna(struct SDNA *sdna, const int versionfile, const int subversionfile); +void blo_do_versions_dna(struct SDNA *sdna, int versionfile, int subversionfile); void blo_do_versions_oldnewmap_insert(struct OldNewMap *onm, const void *oldaddr, diff --git a/source/blender/blenloader/intern/versioning_common.h b/source/blender/blenloader/intern/versioning_common.h index 9e13cc45103..ea850a052ae 100644 --- a/source/blender/blenloader/intern/versioning_common.h +++ b/source/blender/blenloader/intern/versioning_common.h @@ -39,21 +39,18 @@ struct ARegion *do_versions_add_region_if_not_found(struct ListBase *regionbase, * * \return the ID (if found). */ -ID *do_versions_rename_id(Main *bmain, - const short id_type, - const char *name_src, - const char *name_dst); +ID *do_versions_rename_id(Main *bmain, short id_type, const char *name_src, const char *name_dst); void version_node_socket_name(struct bNodeTree *ntree, - const int node_type, + int node_type, const char *old_name, const char *new_name); void version_node_input_socket_name(struct bNodeTree *ntree, - const int node_type, + int node_type, const char *old_name, const char *new_name); void version_node_output_socket_name(struct bNodeTree *ntree, - const int node_type, + int node_type, const char *old_name, const char *new_name); @@ -85,7 +82,7 @@ void version_node_socket_index_animdata( /** * Replace the ID name of all nodes in the tree with the given type with the new name. */ -void version_node_id(struct bNodeTree *ntree, const int node_type, const char *new_name); +void version_node_id(struct bNodeTree *ntree, int node_type, const char *new_name); /** * Convert `SocketName.001` unique name format to `SocketName_001`. Previously both were used. -- cgit v1.2.3