[Bf-blender-cvs] [635510bc6b1] master: Cleanup: Fix warnings in bf_dna

Ray Molenkamp noreply at git.blender.org
Mon May 27 16:49:41 CEST 2019


Commit: 635510bc6b13be2cd5ab4e1806cb129dcb3ca636
Author: Ray Molenkamp
Date:   Mon May 27 08:49:19 2019 -0600
Branches: master
https://developer.blender.org/rB635510bc6b13be2cd5ab4e1806cb129dcb3ca636

Cleanup: Fix warnings in bf_dna

Passing a const char** to MEM_recallocN lead to

C4090	'function': different 'const' qualifiers

warnings with MSVC

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

M	source/blender/makesdna/intern/dna_genfile.c

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

diff --git a/source/blender/makesdna/intern/dna_genfile.c b/source/blender/makesdna/intern/dna_genfile.c
index 8c6ff45d635..3cc005535b6 100644
--- a/source/blender/makesdna/intern/dna_genfile.c
+++ b/source/blender/makesdna/intern/dna_genfile.c
@@ -1585,7 +1585,8 @@ static bool DNA_sdna_patch_struct_member_nr(SDNA *sdna,
 
       if (sdna->names_len == sdna->names_len_alloc) {
         sdna->names_len_alloc += 64;
-        sdna->names = MEM_recallocN(sdna->names, sizeof(*sdna->names) * sdna->names_len_alloc);
+        sdna->names = MEM_recallocN((void *)sdna->names,
+                                    sizeof(*sdna->names) * sdna->names_len_alloc);
         sdna->names_array_len = MEM_recallocN(
             (void *)sdna->names_array_len, sizeof(*sdna->names_array_len) * sdna->names_len_alloc);
       }



More information about the Bf-blender-cvs mailing list