[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47034] trunk/blender/source/blender/ editors/object: previous commit didnt build - add back enum and note that its a copy because of linking error

Campbell Barton ideasman42 at gmail.com
Sat May 26 02:41:13 CEST 2012


Revision: 47034
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47034
Author:   campbellbarton
Date:     2012-05-26 00:41:11 +0000 (Sat, 26 May 2012)
Log Message:
-----------
previous commit didnt build - add back enum and note that its a copy because of linking error

Modified Paths:
--------------
    trunk/blender/source/blender/editors/object/object_add.c
    trunk/blender/source/blender/editors/object/object_vgroup.c

Modified: trunk/blender/source/blender/editors/object/object_add.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_add.c	2012-05-26 00:33:46 UTC (rev 47033)
+++ trunk/blender/source/blender/editors/object/object_add.c	2012-05-26 00:41:11 UTC (rev 47034)
@@ -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)

Modified: trunk/blender/source/blender/editors/object/object_vgroup.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_vgroup.c	2012-05-26 00:33:46 UTC (rev 47033)
+++ trunk/blender/source/blender/editors/object/object_vgroup.c	2012-05-26 00:41:11 UTC (rev 47034)
@@ -1809,7 +1809,6 @@
 		}
 		else {
 			MVert *mv;
-			MDeformVert *dv;
 			int i;
 
 			if (!me->dvert) {




More information about the Bf-blender-cvs mailing list