[Bf-blender-cvs] [11b4d0a3c37] blender-v3.3-release: Attempt to fix build errors on MSVC

Julian Eisel noreply at git.blender.org
Thu Aug 4 18:55:28 CEST 2022


Commit: 11b4d0a3c3787a90e6f1631f7735d0968afbb20a
Author: Julian Eisel
Date:   Thu Aug 4 18:54:32 2022 +0200
Branches: blender-v3.3-release
https://developer.blender.org/rB11b4d0a3c3787a90e6f1631f7735d0968afbb20a

Attempt to fix build errors on MSVC

Same as 03cd79411924, but using a different cast (see 9b9417b66150).

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

M	source/blender/makesrna/intern/rna_path.cc

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

diff --git a/source/blender/makesrna/intern/rna_path.cc b/source/blender/makesrna/intern/rna_path.cc
index 8d63dab3d8b..c1613e3927e 100644
--- a/source/blender/makesrna/intern/rna_path.cc
+++ b/source/blender/makesrna/intern/rna_path.cc
@@ -611,7 +611,7 @@ char *RNA_path_append(const char *path,
 
     if (strkey) {
       const int strkey_esc_max_size = (strlen(strkey) * 2) + 1;
-      char *strkey_esc = BLI_array_alloca(strkey_esc, strkey_esc_max_size);
+      char *strkey_esc = static_cast<char *>(BLI_array_alloca(strkey_esc, strkey_esc_max_size));
       BLI_str_escape(strkey_esc, strkey, strkey_esc_max_size);
       BLI_dynstr_append(dynstr, "\"");
       BLI_dynstr_append(dynstr, strkey_esc);
@@ -706,7 +706,7 @@ const char *RNA_path_array_index_token_find(const char *rna_path, const Property
 
   /* Valid 'array part' of a rna path can only have '[', ']' and digit characters.
    * It may have more than one of those (e.g. `[12][1]`) in case of multi-dimensional arrays. */
-  off_t rna_path_len = (off_t)strlen(rna_path);
+  size_t rna_path_len = (size_t)strlen(rna_path);
   if (rna_path[rna_path_len] != ']') {
     return NULL;
   }



More information about the Bf-blender-cvs mailing list