[Bf-blender-cvs] [03cd7941192] master: Fix attempt for MSVC build error after 42ccbb7cd1d5
Julian Eisel
noreply at git.blender.org
Fri Jul 29 18:11:00 CEST 2022
Commit: 03cd79411924499843d27f04ed55ad17c97b4f4c
Author: Julian Eisel
Date: Fri Jul 29 18:09:44 2022 +0200
Branches: master
https://developer.blender.org/rB03cd79411924499843d27f04ed55ad17c97b4f4c
Fix attempt for MSVC build error after 42ccbb7cd1d5
===================================================================
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 3e0fc9add80..b6532f38110 100644
--- a/source/blender/makesrna/intern/rna_path.cc
+++ b/source/blender/makesrna/intern/rna_path.cc
@@ -610,7 +610,8 @@ 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 = reinterpret_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);
@@ -705,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);
+ int64_t rna_path_len = (int64_t)strlen(rna_path);
if (rna_path[rna_path_len] != ']') {
return NULL;
}
More information about the Bf-blender-cvs
mailing list