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 | |
| 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.
| -rw-r--r-- | source/blender/editors/include/ED_object.h | 2 | ||||
| -rw-r--r-- | source/blender/editors/object/object_relations.c | 3 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 4 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_object.c | 7 |
4 files changed, 7 insertions, 9 deletions
diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h index 43f1757a66d..c62bdc1ba87 100644 --- a/source/blender/editors/include/ED_object.h +++ b/source/blender/editors/include/ED_object.h @@ -77,7 +77,7 @@ typedef enum eParentType { PAR_PATH_CONST, PAR_LATTICE, PAR_VERTEX, - PAR_VERTEX_TRI + PAR_VERTEX_TRI, } eParentType; #ifdef __RNA_TYPES_H__ diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index 19648c291f7..c2d2bffbbe5 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -571,6 +571,9 @@ void ED_object_parent(Object *ob, Object *par, const int type, const char *subst return; } + /* Other partypes are deprecated, do not use here! */ + BLI_assert(ELEM(type & PARTYPE, PAROBJECT, PARSKEL, PARVERT1, PARVERT3, PARBONE)); + /* this could use some more checks */ ob->parent = par; diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 50f94aa09e5..978a97f4b49 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -378,8 +378,8 @@ enum { enum { PARTYPE = (1 << 4) - 1, PAROBJECT = 0, - PARCURVE = 1, - PARKEY = 2, + PARCURVE = 1, /* Deprecated. */ + PARKEY = 2, /* XXX Unused, deprecated? */ PARSKEL = 4, PARVERT1 = 5, 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); } |