diff options
Diffstat (limited to 'source/blender/makesrna/intern')
-rw-r--r-- | source/blender/makesrna/intern/rna_constraint.c | 16 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_curve.c | 1 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_ui_api.c | 9 |
3 files changed, 15 insertions, 11 deletions
diff --git a/source/blender/makesrna/intern/rna_constraint.c b/source/blender/makesrna/intern/rna_constraint.c index 743ad6bfa68..89dd6a308ce 100644 --- a/source/blender/makesrna/intern/rna_constraint.c +++ b/source/blender/makesrna/intern/rna_constraint.c @@ -173,10 +173,18 @@ const EnumPropertyItem rna_enum_constraint_type_items[] = { ICON_CONSTRAINT, "Pivot", "Change pivot point for transforms (buggy)"}, - /* {CONSTRAINT_TYPE_RIGIDBODYJOINT, "RIGID_BODY_JOINT", ICON_CONSTRAINT_DATA, "Rigid Body Joint", - "Use to define a Rigid Body Constraint (for Game Engine use only)"}, */ - /* {CONSTRAINT_TYPE_PYTHON, "SCRIPT", ICON_CONSTRAINT_DATA, "Script", - "Custom constraint(s) written in Python (Not yet implemented)"}, */ +#if 0 + {CONSTRAINT_TYPE_RIGIDBODYJOINT, + "RIGID_BODY_JOINT", + ICON_CONSTRAINT_DATA, + "Rigid Body Joint", + "Use to define a Rigid Body Constraint (for Game Engine use only)"}, + {CONSTRAINT_TYPE_PYTHON, + "SCRIPT", + ICON_CONSTRAINT_DATA, + "Script", + "Custom constraint(s) written in Python (Not yet implemented)"}, +#endif {CONSTRAINT_TYPE_SHRINKWRAP, "SHRINKWRAP", ICON_CONSTRAINT, diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c index bf53d41c484..e73f5841da9 100644 --- a/source/blender/makesrna/intern/rna_curve.c +++ b/source/blender/makesrna/intern/rna_curve.c @@ -1312,7 +1312,6 @@ static void rna_def_charinfo(BlenderRNA *brna) RNA_def_property_boolean_sdna(prop, NULL, "flag", CU_CHINFO_WRAP); RNA_def_property_ui_text(prop, "Wrap", ""); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); - * / # endif prop = RNA_def_property(srna, "use_small_caps", PROP_BOOLEAN, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_ui_api.c b/source/blender/makesrna/intern/rna_ui_api.c index e9ea8e6c838..c41e1623961 100644 --- a/source/blender/makesrna/intern/rna_ui_api.c +++ b/source/blender/makesrna/intern/rna_ui_api.c @@ -881,9 +881,8 @@ void RNA_api_ui_layout(StructRNA *srna) parm = RNA_def_boolean( func, "value", false, "", "Value of the property to call the operator with"); RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); - * / - func = RNA_def_function(srna, "operator_int", "uiItemIntO"); + func = RNA_def_function(srna, "operator_int", "uiItemIntO"); api_ui_item_op_common(func); parm = RNA_def_string(func, "property", NULL, 0, "", "Identifier of property in operator"); RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); @@ -897,9 +896,8 @@ void RNA_api_ui_layout(StructRNA *srna) INT_MIN, INT_MAX); RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); - * / - func = RNA_def_function(srna, "operator_float", "uiItemFloatO"); + func = RNA_def_function(srna, "operator_float", "uiItemFloatO"); api_ui_item_op_common(func); parm = RNA_def_string(func, "property", NULL, 0, "", "Identifier of property in operator"); RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); @@ -913,9 +911,8 @@ void RNA_api_ui_layout(StructRNA *srna) -FLT_MAX, FLT_MAX); RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); - * / - func = RNA_def_function(srna, "operator_string", "uiItemStringO"); + func = RNA_def_function(srna, "operator_string", "uiItemStringO"); api_ui_item_op_common(func); parm = RNA_def_string(func, "property", NULL, 0, "", "Identifier of property in operator"); RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); |