archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

[#24627] [minor] Object type is TEXT, but icon names are FONT

Browse Source 
change object.type enum name TEXT for FONT to match icon and ID type names.
This commit is contained in:
Campbell Barton
2010-11-10 07:44:48 +00:00
parent 91c1b80a5f
commit 99396da62c
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/op/io_scene_3ds/export_3ds.py
View File

@@ -913,7 +913,7 @@ def save(operator, context, filepath=""):
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')

10
release/scripts/ui/properties_data_curve.py
View File

@@ -28,7 +28,7 @@ class CurveButtonsPanel():
@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 @@ class DATA_PT_shape_curve(CurveButtonsPanel, bpy.types.Panel):
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 @@ class DATA_PT_font(CurveButtonsPanel, bpy.types.Panel):
@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 @@ class DATA_PT_paragraph(CurveButtonsPanel, bpy.types.Panel):
@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 @@ class DATA_PT_textboxes(CurveButtonsPanel, bpy.types.Panel):
@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

2
source/blender/makesrna/intern/rna_object.c
View File

@@ -1566,7 +1566,7 @@ static void rna_def_object(BlenderRNA *brna)
{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", ""},