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/editors | |
| 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/editors')
| -rw-r--r-- | source/blender/editors/include/ED_object.h | 2 | ||||
| -rw-r--r-- | source/blender/editors/object/object_relations.c | 3 |
2 files changed, 4 insertions, 1 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; |