previous commit didnt build - add back enum and note that its a copy because of linki...
authorCampbell Barton <ideasman42@gmail.com>
Sat, 26 May 2012 00:41:11 +0000 (00:41 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 26 May 2012 00:41:11 +0000 (00:41 +0000)
source/blender/editors/object/object_add.c
source/blender/editors/object/object_vgroup.c

index d70140d6cc655565e67b3bc9f5187421d91bcd2d..76967d61b9e848c71ca85e892f703f027efb8bef 100644 (file)
 
 #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)
index 0c0611d3d33e8771e80709796a2e7a49b0be1078..b5a0451b50719857e82c3108a9ba214849eccde7 100644 (file)
@@ -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) {