diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-01-13 17:29:57 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-01-13 17:29:57 +0300 |
| commit | e2054b291c35cfd9b4e020b584ec465007ecd189 (patch) | |
| tree | 220ccdbf9d5d8cd9af7fe816a795dad529892fa1 /source/blender/makesrna/intern/rna_wm_api.c | |
| parent | d4fa68e448a1808c6ca5628840a8940aefe263b3 (diff) | |
bugfix [#25588] Not work fcurve.keyframe_points.add
The problem was flag-enums were being treated as regular enums, a default value of 0 was using the first enum item, whereas with flag enums we want to be able to use 0 as a default value to specify all flags are off.
Diffstat (limited to 'source/blender/makesrna/intern/rna_wm_api.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_wm_api.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/source/blender/makesrna/intern/rna_wm_api.c b/source/blender/makesrna/intern/rna_wm_api.c index e043db7d9d6..b934bdfc979 100644 --- a/source/blender/makesrna/intern/rna_wm_api.c +++ b/source/blender/makesrna/intern/rna_wm_api.c @@ -93,8 +93,7 @@ static void rna_generic_op_invoke(FunctionRNA *func, int flag) } if(flag & WM_GEN_INVOKE_RETURN) { - parm= RNA_def_enum(func, "result", operator_return_items, OPERATOR_CANCELLED, "result", ""); - RNA_def_property_flag(parm, PROP_ENUM_FLAG); + parm= RNA_def_enum_flag(func, "result", operator_return_items, OPERATOR_CANCELLED, "result", ""); RNA_def_function_return(func, parm); } } @@ -146,8 +145,8 @@ void RNA_api_operator(StructRNA *srna) /* utility, not for registering */ func= RNA_def_function(srna, "report", "rna_Operator_report"); - parm= RNA_def_enum(func, "type", wm_report_items, 0, "Type", ""); - RNA_def_property_flag(parm, PROP_REQUIRED|PROP_ENUM_FLAG); + parm= RNA_def_enum_flag(func, "type", wm_report_items, 0, "Type", ""); + RNA_def_property_flag(parm, PROP_REQUIRED); parm= RNA_def_string(func, "message", "", 0, "Report Message", ""); RNA_def_property_flag(parm, PROP_REQUIRED); @@ -167,8 +166,7 @@ void RNA_api_operator(StructRNA *srna) RNA_def_function_flag(func, FUNC_REGISTER_OPTIONAL); RNA_def_pointer(func, "context", "Context", "", ""); - parm= RNA_def_enum(func, "result", operator_return_items, OPERATOR_CANCELLED, "result", ""); // better name? - RNA_def_property_flag(parm, PROP_ENUM_FLAG); + parm= RNA_def_enum_flag(func, "result", operator_return_items, OPERATOR_CANCELLED, "result", ""); // better name? RNA_def_function_return(func, parm); /* check */ @@ -187,8 +185,7 @@ void RNA_api_operator(StructRNA *srna) RNA_def_pointer(func, "context", "Context", "", ""); RNA_def_pointer(func, "event", "Event", "", ""); - parm= RNA_def_enum(func, "result", operator_return_items, OPERATOR_CANCELLED, "result", ""); // better name? - RNA_def_property_flag(parm, PROP_ENUM_FLAG); + parm= RNA_def_enum_flag(func, "result", operator_return_items, OPERATOR_CANCELLED, "result", ""); // better name? RNA_def_function_return(func, parm); func= RNA_def_function(srna, "modal", NULL); /* same as invoke */ @@ -197,8 +194,7 @@ void RNA_api_operator(StructRNA *srna) RNA_def_pointer(func, "context", "Context", "", ""); RNA_def_pointer(func, "event", "Event", "", ""); - parm= RNA_def_enum(func, "result", operator_return_items, OPERATOR_CANCELLED, "result", ""); // better name? - RNA_def_property_flag(parm, PROP_ENUM_FLAG); + parm= RNA_def_enum_flag(func, "result", operator_return_items, OPERATOR_CANCELLED, "result", ""); // better name? RNA_def_function_return(func, parm); /* draw */ @@ -215,8 +211,8 @@ void RNA_api_macro(StructRNA *srna) /* utility, not for registering */ func= RNA_def_function(srna, "report", "rna_Operator_report"); - parm= RNA_def_enum(func, "type", wm_report_items, 0, "Type", ""); - RNA_def_property_flag(parm, PROP_REQUIRED|PROP_ENUM_FLAG); + parm= RNA_def_enum_flag(func, "type", wm_report_items, 0, "Type", ""); + RNA_def_property_flag(parm, PROP_REQUIRED); parm= RNA_def_string(func, "message", "", 0, "Report Message", ""); RNA_def_property_flag(parm, PROP_REQUIRED); |