diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-06-23 18:35:55 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-06-23 18:35:55 +0300 |
| commit | b318795c3b3dc3bc274dfb445b4eb11b1fd6257e (patch) | |
| tree | 5af78c9d3dd732bbed73ab9e16d31e710302733c /source/blender/makesrna | |
| parent | 90b4131d160f1577f5177d65a2c320ff342b14ae (diff) | |
Fix T45051: Curve parent bug.
PARCURVE is deprecated parting type, should never have been exposed to user!
Not a regression, but safe enough for final 2.75 imho.
Diffstat (limited to 'source/blender/makesrna')
| -rw-r--r-- | source/blender/makesrna/intern/rna_object.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index c6a6136d90d..3113b702dad 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -87,8 +87,6 @@ EnumPropertyItem object_empty_drawtype_items[] = { static EnumPropertyItem parent_type_items[] = { {PAROBJECT, "OBJECT", 0, "Object", "The object is parented to an object"}, - {PARCURVE, "CURVE", 0, "Curve", "The object is parented to a curve"}, - {PARKEY, "KEY", 0, "Key", ""}, {PARSKEL, "ARMATURE", 0, "Armature", ""}, {PARSKEL, "LATTICE", 0, "Lattice", "The object is parented to a lattice"}, /* PARSKEL reuse will give issues */ {PARVERT1, "VERTEX", 0, "Vertex", "The object is parented to a vertex"}, @@ -467,10 +465,7 @@ static EnumPropertyItem *rna_Object_parent_type_itemf(bContext *UNUSED(C), Point if (ob->parent) { Object *par = ob->parent; - if (par->type == OB_CURVE) { - RNA_enum_items_add_value(&item, &totitem, parent_type_items, PARCURVE); - } - else if (par->type == OB_LATTICE) { + if (par->type == OB_LATTICE) { /* special hack: prevents this overriding others */ RNA_enum_items_add_value(&item, &totitem, &parent_type_items[4], PARSKEL); } |