diff options
author | Campbell Barton <campbell@blender.org> | 2022-08-26 07:43:16 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-08-26 07:43:16 +0300 |
commit | e77ac31799c17677be03f5464cec49dd8d5e2c59 (patch) | |
tree | b4c5297dcae279bdeb010d26a6ecb55b40353f11 /source/blender/makesrna | |
parent | 5bd4aea29c00a2d56df7d873764cc3a380ac9e9e (diff) |
makesrna: type check bool/int/float/enum get/set callbacks
While converting types from callbacks isn't a bug, it's unlikely
we ever want to do this on purpose and can hide mistakes such as
silently converting floating point values to ints as happened
with Sequencer.frame_start.
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r-- | source/blender/makesrna/intern/makesrna.c | 80 |
1 files changed, 76 insertions, 4 deletions
diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c index 2b24bd0b39c..a7b8488c371 100644 --- a/source/blender/makesrna/intern/makesrna.c +++ b/source/blender/makesrna/intern/makesrna.c @@ -826,7 +826,23 @@ static char *rna_def_property_get_func( fprintf(f, "{\n"); if (manualfunc) { - fprintf(f, " %s(ptr, values);\n", manualfunc); + /* Assign `fn` to ensure function signatures match. */ + if (prop->type == PROP_BOOLEAN) { + fprintf(f, " PropBooleanArrayGetFunc fn = %s;\n", manualfunc); + fprintf(f, " fn(ptr, values);\n"); + } + else if (prop->type == PROP_INT) { + fprintf(f, " PropIntArrayGetFunc fn = %s;\n", manualfunc); + fprintf(f, " fn(ptr, values);\n"); + } + else if (prop->type == PROP_FLOAT) { + fprintf(f, " PropFloatArrayGetFunc fn = %s;\n", manualfunc); + fprintf(f, " fn(ptr, values);\n"); + } + else { + BLI_assert_unreachable(); /* Valid but should be handled by type checks. */ + fprintf(f, " %s(ptr, values);\n", manualfunc); + } } else { rna_print_data_get(f, dp); @@ -902,7 +918,27 @@ static char *rna_def_property_get_func( fprintf(f, "{\n"); if (manualfunc) { - fprintf(f, " return %s(ptr);\n", manualfunc); + /* Assign `fn` to ensure function signatures match. */ + if (prop->type == PROP_BOOLEAN) { + fprintf(f, " PropBooleanGetFunc fn = %s;\n", manualfunc); + fprintf(f, " return fn(ptr);\n"); + } + else if (prop->type == PROP_INT) { + fprintf(f, " PropIntGetFunc fn = %s;\n", manualfunc); + fprintf(f, " return fn(ptr);\n"); + } + else if (prop->type == PROP_FLOAT) { + fprintf(f, " PropFloatGetFunc fn = %s;\n", manualfunc); + fprintf(f, " return fn(ptr);\n"); + } + else if (prop->type == PROP_ENUM) { + fprintf(f, " PropEnumGetFunc fn = %s;\n", manualfunc); + fprintf(f, " return fn(ptr);\n"); + } + else { + BLI_assert_unreachable(); /* Valid but should be handled by type checks. */ + fprintf(f, " return %s(ptr);\n", manualfunc); + } } else { rna_print_data_get(f, dp); @@ -1197,7 +1233,23 @@ static char *rna_def_property_set_func( fprintf(f, "{\n"); if (manualfunc) { - fprintf(f, " %s(ptr, values);\n", manualfunc); + /* Assign `fn` to ensure function signatures match. */ + if (prop->type == PROP_BOOLEAN) { + fprintf(f, " PropBooleanArraySetFunc fn = %s;\n", manualfunc); + fprintf(f, " fn(ptr, values);\n"); + } + else if (prop->type == PROP_INT) { + fprintf(f, " PropIntArraySetFunc fn = %s;\n", manualfunc); + fprintf(f, " fn(ptr, values);\n"); + } + else if (prop->type == PROP_FLOAT) { + fprintf(f, " PropFloatArraySetFunc fn = %s;\n", manualfunc); + fprintf(f, " fn(ptr, values);\n"); + } + else { + BLI_assert_unreachable(); /* Valid but should be handled by type checks. */ + fprintf(f, " %s(ptr, values);\n", manualfunc); + } } else { rna_print_data_get(f, dp); @@ -1289,7 +1341,27 @@ static char *rna_def_property_set_func( fprintf(f, "{\n"); if (manualfunc) { - fprintf(f, " %s(ptr, value);\n", manualfunc); + /* Assign `fn` to ensure function signatures match. */ + if (prop->type == PROP_BOOLEAN) { + fprintf(f, " PropBooleanSetFunc fn = %s;\n", manualfunc); + fprintf(f, " fn(ptr, value);\n"); + } + else if (prop->type == PROP_INT) { + fprintf(f, " PropIntSetFunc fn = %s;\n", manualfunc); + fprintf(f, " fn(ptr, value);\n"); + } + else if (prop->type == PROP_FLOAT) { + fprintf(f, " PropFloatSetFunc fn = %s;\n", manualfunc); + fprintf(f, " fn(ptr, value);\n"); + } + else if (prop->type == PROP_ENUM) { + fprintf(f, " PropEnumSetFunc fn = %s;\n", manualfunc); + fprintf(f, " fn(ptr, value);\n"); + } + else { + BLI_assert_unreachable(); /* Valid but should be handled by type checks. */ + fprintf(f, " %s(ptr, value);\n", manualfunc); + } } else { rna_print_data_get(f, dp); |