diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-06-25 21:23:16 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-06-25 21:23:16 +0300 |
| commit | 1e73c400a7b300dbbec58cd7f33c2970652ad23c (patch) | |
| tree | 1cb47f687af19e30113d3cbf857267653f86cbb5 /source/blender/makesrna/intern/rna_object.c | |
| parent | 7f8df735ae89b36086b3aa555ad50a656d1a4764 (diff) | |
| parent | 2cdcb1c1716180c00c23feb8332f17c2bab74864 (diff) | |
Merge branch 'master' into gooseberry
Conflicts:
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/makesrna/intern/rna_nodetree.c
Diffstat (limited to 'source/blender/makesrna/intern/rna_object.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_object.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index 17c75da2c87..c2489986341 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -47,7 +47,6 @@ #include "BKE_paint.h" #include "BKE_editmesh.h" #include "BKE_group.h" /* needed for BKE_group_object_exists() */ -#include "BKE_object.h" /* Needed for BKE_object_matrix_local_get() */ #include "BKE_object_deform.h" #include "RNA_access.h" @@ -90,8 +89,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"}, @@ -208,7 +205,6 @@ EnumPropertyItem object_axis_unsigned_items[] = { #include "BKE_strands.h" #include "BKE_deform.h" -#include "ED_mesh.h" #include "ED_object.h" #include "ED_particle.h" #include "ED_curve.h" @@ -475,10 +471,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); } |