diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-05-26 04:41:11 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-05-26 04:41:11 +0400 |
commit | 49b6867e0c8c3439564d102d975ca60a2e285996 (patch) | |
tree | aa88de5a966392a8360564131b6efe00f574d295 /source | |
parent | c904f5363d8657e99360c4796db52054377fba1f (diff) |
previous commit didnt build - add back enum and note that its a copy because of linking error
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/object/object_add.c | 11 | ||||
-rw-r--r-- | source/blender/editors/object/object_vgroup.c | 1 |
2 files changed, 11 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index d70140d6cc6..76967d61b9e 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -107,6 +107,17 @@ #include "object_intern.h" +/* this is an exact copy of the define in rna_lamp.c + * kept here because of linking order */ +EnumPropertyItem lamp_type_items[] = { + {LA_LOCAL, "POINT", 0, "Point", "Omnidirectional point light source"}, + {LA_SUN, "SUN", 0, "Sun", "Constant direction parallel ray light source"}, + {LA_SPOT, "SPOT", 0, "Spot", "Directional cone light source"}, + {LA_HEMI, "HEMI", 0, "Hemi", "180 degree constant light source"}, + {LA_AREA, "AREA", 0, "Area", "Directional area light source"}, + {0, NULL, 0, NULL, NULL} +}; + /************************** Exported *****************************/ void ED_object_location_from_view(bContext *C, float *loc) diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c index 0c0611d3d33..b5a0451b507 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -1809,7 +1809,6 @@ static void vgroup_active_remove_verts(Object *ob, const int allverts, bDeformGr } else { MVert *mv; - MDeformVert *dv; int i; if (!me->dvert) { |