[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32976] trunk/blender: [#24627] [minor] Object type is TEXT, but icon names are FONT

[Campbell Barton]

Revision: 32976
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32976
Author:   campbellbarton
Date:     2010-11-10 08:44:48 +0100 (Wed, 10 Nov 2010)

Log Message:
-----------
[#24627] [minor] Object type is TEXT, but icon names are FONT
change object.type enum name TEXT for FONT to match icon and ID type names.

Modified Paths:
--------------
    trunk/blender/release/scripts/op/io_scene_3ds/export_3ds.py
    trunk/blender/release/scripts/ui/properties_data_curve.py
    trunk/blender/source/blender/makesrna/intern/rna_object.c

Modified: trunk/blender/release/scripts/op/io_scene_3ds/export_3ds.py
===================================================================
--- trunk/blender/release/scripts/op/io_scene_3ds/export_3ds.py	2010-11-10 07:10:23 UTC (rev 32975)
+++ trunk/blender/release/scripts/op/io_scene_3ds/export_3ds.py	2010-11-10 07:44:48 UTC (rev 32976)
@@ -913,7 +913,7 @@
         for ob_derived, mat in derived:
 # 		for ob_derived, mat in getDerivedObjects(ob, False):
 
-            if ob.type not in ('MESH', 'CURVE', 'SURFACE', 'TEXT', 'META'):
+            if ob.type not in ('MESH', 'CURVE', 'SURFACE', 'FONT', 'META'):
                 continue
 
             data = ob_derived.create_mesh(scene, True, 'PREVIEW')

Modified: trunk/blender/release/scripts/ui/properties_data_curve.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_data_curve.py	2010-11-10 07:10:23 UTC (rev 32975)
+++ trunk/blender/release/scripts/ui/properties_data_curve.py	2010-11-10 07:44:48 UTC (rev 32976)
@@ -28,7 +28,7 @@
 
     @classmethod
     def poll(cls, context):
-        return (context.object and context.object.type in ('CURVE', 'SURFACE', 'TEXT') and context.curve)
+        return (context.object and context.object.type in ('CURVE', 'SURFACE', 'FONT') and context.curve)
 
 
 class CurveButtonsPanelCurve(CurveButtonsPanel):
@@ -79,7 +79,7 @@
         curve = context.curve
         is_surf = (ob.type == 'SURFACE')
         is_curve = (ob.type == 'CURVE')
-        is_text = (ob.type == 'TEXT')
+        is_text = (ob.type == 'FONT')
 
         if is_curve:
             row = layout.row()
@@ -261,7 +261,7 @@
 
     @classmethod
     def poll(cls, context):
-        return (context.object and context.object.type == 'TEXT' and context.curve)
+        return (context.object and context.object.type == 'FONT' and context.curve)
 
     def draw(self, context):
         layout = self.layout
@@ -317,7 +317,7 @@
 
     @classmethod
     def poll(cls, context):
-        return (context.object and context.object.type == 'TEXT' and context.curve)
+        return (context.object and context.object.type == 'FONT' and context.curve)
 
     def draw(self, context):
         layout = self.layout
@@ -346,7 +346,7 @@
 
     @classmethod
     def poll(cls, context):
-        return (context.object and context.object.type == 'TEXT' and context.curve)
+        return (context.object and context.object.type == 'FONT' and context.curve)
 
     def draw(self, context):
         layout = self.layout

Modified: trunk/blender/source/blender/makesrna/intern/rna_object.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_object.c	2010-11-10 07:10:23 UTC (rev 32975)
+++ trunk/blender/source/blender/makesrna/intern/rna_object.c	2010-11-10 07:44:48 UTC (rev 32976)
@@ -1566,7 +1566,7 @@
 		{OB_MESH, "MESH", 0, "Mesh", ""},
 		{OB_CURVE, "CURVE", 0, "Curve", ""},
 		{OB_SURF, "SURFACE", 0, "Surface", ""},
-		{OB_FONT, "TEXT", 0, "Text", ""},
+		{OB_FONT, "FONT", 0, "Font", ""},
 		{OB_MBALL, "META", 0, "Meta", ""},
 		{OB_LAMP, "LAMP", 0, "Lamp", ""},
 		{OB_CAMERA, "CAMERA", 0, "Camera", ""},