[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33704] trunk/blender/source/blender/ makesrna/intern/rna_object.c: missed this file before (de-duplicating enum) .

[Campbell Barton]

Revision: 33704
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33704
Author:   campbellbarton
Date:     2010-12-16 10:51:55 +0100 (Thu, 16 Dec 2010)

Log Message:
-----------
missed this file before (de-duplicating enum).

Modified Paths:
--------------
    trunk/blender/source/blender/makesrna/intern/rna_object.c

Modified: trunk/blender/source/blender/makesrna/intern/rna_object.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_object.c   2010-12-16 
05:02:15 UTC (rev 33703)
+++ trunk/blender/source/blender/makesrna/intern/rna_object.c   2010-12-16 
09:51:55 UTC (rev 33704)
@@ -92,14 +92,14 @@
 /* used for 2 enums */
 #define OBTYPE_CU_CURVE {OB_CURVE, "CURVE", 0, "Curve", ""}
 #define OBTYPE_CU_SURF {OB_SURF, "SURFACE", 0, "Surface", ""}
-#define OBTYPE_CU_TEXT {OB_FONT, "TEXT", 0, "Text", ""}
+#define OBTYPE_CU_FONT {OB_FONT, "FONT", 0, "Font", ""}
     
 EnumPropertyItem object_type_items[] = {
        {OB_MESH, "MESH", 0, "Mesh", ""},
        OBTYPE_CU_CURVE,
        OBTYPE_CU_SURF,
        {OB_MBALL, "META", 0, "Meta", ""},
-       OBTYPE_CU_TEXT,
+       OBTYPE_CU_FONT,
        {0, "", 0, NULL, NULL},
        {OB_ARMATURE, "ARMATURE", 0, "Armature", ""},
        {OB_LATTICE, "LATTICE", 0, "Lattice", ""},
@@ -112,7 +112,7 @@
 EnumPropertyItem object_type_curve_items[] = {
        OBTYPE_CU_CURVE,
        OBTYPE_CU_SURF,
-       OBTYPE_CU_TEXT,
+       OBTYPE_CU_FONT,
        {0, NULL, 0, NULL, NULL}};
 
 
@@ -1586,19 +1586,6 @@
        StructRNA *srna;
        PropertyRNA *prop;
 
-       static EnumPropertyItem object_type_items[] = {
-               {OB_EMPTY, "EMPTY", 0, "Empty", ""},
-               {OB_MESH, "MESH", 0, "Mesh", ""},
-               {OB_CURVE, "CURVE", 0, "Curve", ""},
-               {OB_SURF, "SURFACE", 0, "Surface", ""},
-               {OB_FONT, "FONT", 0, "Font", ""},
-               {OB_MBALL, "META", 0, "Meta", ""},
-               {OB_LAMP, "LAMP", 0, "Lamp", ""},
-               {OB_CAMERA, "CAMERA", 0, "Camera", ""},
-               {OB_LATTICE, "LATTICE", 0, "Lattice", ""},
-               {OB_ARMATURE, "ARMATURE", 0, "Armature", ""},
-               {0, NULL, 0, NULL, NULL}};
-
        static EnumPropertyItem empty_drawtype_items[] = {
                {OB_ARROWS, "ARROWS", 0, "Arrows", ""},
                {OB_SINGLE_ARROW, "SINGLE_ARROW", 0, "Single Arrow", ""},


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs