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:
authorBrecht Van Lommel <brecht>2020-03-03 19:21:18 +0300
committerBrecht Van Lommel <brecht@blender.org>2020-03-03 19:21:47 +0300
commit0c603cffd123689c3021862a9d76dad9fbe13f4d (patch)
tree2b5112f4154e1019d8968fc74f85409001eb5fde /source/blender/makesrna/intern/rna_define.c
parent78383f7a9f9c3a2b3cc5f6c1ea0834cd7278317c (diff)
RNA: support 64 bit boolean bitflags in DNA
This does not affect the RNA access API, since how the boolean is read from DNA abstracted away in the API. Differential Revision: https://developer.blender.org/D7002
Diffstat (limited to 'source/blender/makesrna/intern/rna_define.c')
-rw-r--r--source/blender/makesrna/intern/rna_define.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/makesrna/intern/rna_define.c b/source/blender/makesrna/intern/rna_define.c
index 4150daa0f63..56516c8af4d 100644
--- a/source/blender/makesrna/intern/rna_define.c
+++ b/source/blender/makesrna/intern/rna_define.c
@@ -2188,7 +2188,7 @@ static PropertyDefRNA *rna_def_property_sdna(PropertyRNA *prop,
void RNA_def_property_boolean_sdna(PropertyRNA *prop,
const char *structname,
const char *propname,
- int bit)
+ int64_t bit)
{
PropertyDefRNA *dp;
BoolPropertyRNA *bprop = (BoolPropertyRNA *)prop;
@@ -2209,7 +2209,7 @@ void RNA_def_property_boolean_sdna(PropertyRNA *prop,
if (DefRNA.silent == 0) {
/* error check to ensure floats are not wrapped as ints/bools */
- if (dp->dnatype && *dp->dnatype && IS_DNATYPE_INT_COMPAT(dp->dnatype) == 0) {
+ if (dp->dnatype && *dp->dnatype && IS_DNATYPE_BOOLEAN_COMPAT(dp->dnatype) == 0) {
CLOG_ERROR(&LOG,
"%s.%s is a '%s' but wrapped as type '%s'.",
srna->identifier,
@@ -2279,7 +2279,7 @@ void RNA_def_property_boolean_sdna(PropertyRNA *prop,
void RNA_def_property_boolean_negative_sdna(PropertyRNA *prop,
const char *structname,
const char *propname,
- int booleanbit)
+ int64_t booleanbit)
{
PropertyDefRNA *dp;
@@ -2288,7 +2288,7 @@ void RNA_def_property_boolean_negative_sdna(PropertyRNA *prop,
dp = rna_find_struct_property_def(DefRNA.laststruct, prop);
if (dp) {
- dp->booleannegative = 1;
+ dp->booleannegative = true;
}
}