Commit: 9d88fb1dffecbdf88a5221af5b4c397ace8b7f25
Author: Campbell Barton
Date: Mon Apr 28 03:42:13 2014 +1000
https://developer.blender.org/rB9d88fb1dffecbdf88a5221af5b4c397ace8b7f25
RNA: Use unsigned ints when bit-shifting
===================================================================
M source/blender/makesrna/intern/makesrna.c
===================================================================
diff --git a/source/blender/makesrna/intern/makesrna.c
b/source/blender/makesrna/intern/makesrna.c
index faddeaf..7f1f04c 100644
--- a/source/blender/makesrna/intern/makesrna.c
+++ b/source/blender/makesrna/intern/makesrna.c
@@ -659,7 +659,7 @@ static char *rna_def_property_get_func(FILE *f, StructRNA
*srna, PropertyRNA *pr
if (dp->dnaarraylength == 1) {
if (prop->type == PROP_BOOLEAN
&& dp->booleanbit) {
- fprintf(f, "
values[i] = %s((data->%s & (%d << i)) != 0);\n",
+ fprintf(f, "
values[i] = %s((data->%s & (%du << i)) != 0);\n",
(dp->booleannegative) ? "!" : "", dp->dnaname, dp->booleanbit);
}
else {
@@ -897,14 +897,14 @@ static char *rna_def_property_set_func(FILE *f, StructRNA
*srna, PropertyRNA *pr
if (prop->flag & PROP_DYNAMIC) {
char *lenfunc =
rna_alloc_function_name(srna->identifier, rna_safe_id(prop->identifier),
"set_length");
- fprintf(f, " int i,
arraylen[RNA_MAX_ARRAY_DIMENSION];\n");
- fprintf(f, " int len =
%s(ptr, arraylen);\n\n", lenfunc);
+ fprintf(f, " unsigned int i,
arraylen[RNA_MAX_ARRAY_DIMENSION];\n");
+ fprintf(f, " unsigned int
len = %s(ptr, arraylen);\n\n", lenfunc);
rna_clamp_value_range(f, prop);
fprintf(f, " for (i = 0; i <
len; i++) {\n");
MEM_freeN(lenfunc);
}
else {
- fprintf(f, " int i;\n\n");
+ fprintf(f, " unsigned int
i;\n\n");
rna_clamp_value_range(f, prop);
fprintf(f, " for (i = 0; i <
%u; i++) {\n", prop->totarraylength);
}
@@ -913,7 +913,7 @@ static char *rna_def_property_set_func(FILE *f, StructRNA
*srna, PropertyRNA *pr
if (prop->type == PROP_BOOLEAN
&& dp->booleanbit) {
fprintf(f, "
if (%svalues[i]) data->%s |= (%d<<i);\n",
(dp->booleannegative) ? "!" : "", dp->dnaname, dp->booleanbit);
- fprintf(f, "
else data->%s &= ~(%d << i);\n", dp->dnaname, dp->booleanbit);
+ fprintf(f, "
else data->%s &= ~(%du << i);\n", dp->dnaname, dp->booleanbit);
}
else {
fprintf(f, "
(&data->%s)[i] = %s", dp->dnaname, (dp->booleannegative) ? "!" : "");
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
