sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Internal Code Renaming:

Browse Source 
Donut > Torus
This commit is contained in:
Thomas Dinges 2010-09-01 20:18:31 +00:00
parent 1c4b6ff334
commit bd79d80b8a
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/op/add_mesh_torus.py
View File

@ -135,7 +135,7 @@ class AddTorus(bpy.types.Operator):
def menu_func(self, context): def menu_func(self, context):
self.layout.operator(AddTorus.bl_idname, text="Torus", icon='MESH_DONUT') self.layout.operator(AddTorus.bl_idname, text="Torus", icon='MESH_TORUS')
def register(): def register():

2
release/scripts/ui/space_info.py
View File

@ -202,7 +202,7 @@ class INFO_MT_surface_add(bpy.types.Menu):
layout.operator("surface.primitive_nurbs_surface_surface_add", icon='SURFACE_NSURFACE', text="NURBS Surface") layout.operator("surface.primitive_nurbs_surface_surface_add", icon='SURFACE_NSURFACE', text="NURBS Surface")
layout.operator("surface.primitive_nurbs_surface_tube_add", icon='SURFACE_NTUBE', text="NURBS Tube") layout.operator("surface.primitive_nurbs_surface_tube_add", icon='SURFACE_NTUBE', text="NURBS Tube")
layout.operator("surface.primitive_nurbs_surface_sphere_add", icon='SURFACE_NSPHERE', text="NURBS Sphere") layout.operator("surface.primitive_nurbs_surface_sphere_add", icon='SURFACE_NSPHERE', text="NURBS Sphere")
layout.operator("surface.primitive_nurbs_surface_donut_add", icon='SURFACE_NDONUT', text="NURBS Torus") layout.operator("surface.primitive_nurbs_surface_torus_add", icon='SURFACE_NTORUS', text="NURBS Torus")
class INFO_MT_armature_add(bpy.types.Menu): class INFO_MT_armature_add(bpy.types.Menu):

2
source/blender/editors/curve/curve_intern.h
View File

@ -99,7 +99,7 @@ void SURFACE_OT_primitive_nurbs_surface_circle_add(struct wmOperatorType *ot);
void SURFACE_OT_primitive_nurbs_surface_surface_add(struct wmOperatorType *ot); void SURFACE_OT_primitive_nurbs_surface_surface_add(struct wmOperatorType *ot);
void SURFACE_OT_primitive_nurbs_surface_tube_add(struct wmOperatorType *ot); void SURFACE_OT_primitive_nurbs_surface_tube_add(struct wmOperatorType *ot);
void SURFACE_OT_primitive_nurbs_surface_sphere_add(struct wmOperatorType *ot); void SURFACE_OT_primitive_nurbs_surface_sphere_add(struct wmOperatorType *ot);
void SURFACE_OT_primitive_nurbs_surface_donut_add(struct wmOperatorType *ot); void SURFACE_OT_primitive_nurbs_surface_torus_add(struct wmOperatorType *ot);
void CURVE_OT_de_select_first(struct wmOperatorType *ot); void CURVE_OT_de_select_first(struct wmOperatorType *ot);
void CURVE_OT_de_select_last(struct wmOperatorType *ot); void CURVE_OT_de_select_last(struct wmOperatorType *ot);

2
source/blender/editors/curve/curve_ops.c
View File

@ -107,7 +107,7 @@ void ED_operatortypes_curve(void)
WM_operatortype_append(SURFACE_OT_primitive_nurbs_surface_surface_add); WM_operatortype_append(SURFACE_OT_primitive_nurbs_surface_surface_add);
WM_operatortype_append(SURFACE_OT_primitive_nurbs_surface_tube_add); WM_operatortype_append(SURFACE_OT_primitive_nurbs_surface_tube_add);
WM_operatortype_append(SURFACE_OT_primitive_nurbs_surface_sphere_add); WM_operatortype_append(SURFACE_OT_primitive_nurbs_surface_sphere_add);
WM_operatortype_append(SURFACE_OT_primitive_nurbs_surface_donut_add); WM_operatortype_append(SURFACE_OT_primitive_nurbs_surface_torus_add);
WM_operatortype_append(CURVE_OT_smooth); WM_operatortype_append(CURVE_OT_smooth);
WM_operatortype_append(CURVE_OT_smooth_radius); WM_operatortype_append(CURVE_OT_smooth_radius);

14
source/blender/editors/curve/editcurve.c
View File

@ -5949,7 +5949,7 @@ Nurb *add_nurbs_primitive(bContext *C, float mat[4][4], int type, int newname)
BLI_remlink(editnurb, nu); BLI_remlink(editnurb, nu);
} }
break; break;
case CU_PRIM_DONUT: /* donut */ case CU_PRIM_DONUT: /* torus */
if( cutype==CU_NURBS ) { if( cutype==CU_NURBS ) {
float tmp_cent[3] = {0.f, 0.f, 0.f}; float tmp_cent[3] = {0.f, 0.f, 0.f};
float tmp_vec[3] = {0.f, 0.f, 0.f}; float tmp_vec[3] = {0.f, 0.f, 0.f};
@ -6281,21 +6281,21 @@ void SURFACE_OT_primitive_nurbs_surface_sphere_add(wmOperatorType *ot)
ED_object_add_generic_props(ot, TRUE); ED_object_add_generic_props(ot, TRUE);
} }
static int add_primitive_nurbs_surface_donut_exec(bContext *C, wmOperator *op) static int add_primitive_nurbs_surface_torus_exec(bContext *C, wmOperator *op)
{ {
return surf_prim_add(C, op, CU_PRIM_DONUT|CU_NURBS); return surf_prim_add(C, op, CU_PRIM_DONUT|CU_NURBS);
} }
void SURFACE_OT_primitive_nurbs_surface_donut_add(wmOperatorType *ot) void SURFACE_OT_primitive_nurbs_surface_torus_add(wmOperatorType *ot)
{ {
/* identifiers */ /* identifiers */
ot->name= "Add Surface Donut"; ot->name= "Add Surface Torus";
ot->description= "Construct a Nurbs surface Donut"; ot->description= "Construct a Nurbs surface Torus";
ot->idname= "SURFACE_OT_primitive_nurbs_surface_donut_add"; ot->idname= "SURFACE_OT_primitive_nurbs_surface_torus_add";
/* api callbacks */ /* api callbacks */
ot->invoke= ED_object_add_generic_invoke; ot->invoke= ED_object_add_generic_invoke;
ot->exec= add_primitive_nurbs_surface_donut_exec; ot->exec= add_primitive_nurbs_surface_torus_exec;
ot->poll= ED_operator_scene_editable; ot->poll= ED_operator_scene_editable;
/* flags */ /* flags */

4
source/blender/editors/include/UI_icons.h
View File

@ -346,7 +346,7 @@ DEF_ICON(ICON_MESH_ICOSPHERE)
DEF_ICON(ICON_MESH_GRID) DEF_ICON(ICON_MESH_GRID)
DEF_ICON(ICON_MESH_MONKEY) DEF_ICON(ICON_MESH_MONKEY)
DEF_ICON(ICON_MESH_TUBE) DEF_ICON(ICON_MESH_TUBE)
DEF_ICON(ICON_MESH_DONUT) DEF_ICON(ICON_MESH_TORUS)
DEF_ICON(ICON_MESH_CONE) DEF_ICON(ICON_MESH_CONE)
DEF_ICON(ICON_BLANK610) DEF_ICON(ICON_BLANK610)
DEF_ICON(ICON_BLANK611) DEF_ICON(ICON_BLANK611)
@ -371,7 +371,7 @@ DEF_ICON(ICON_SURFACE_NCIRCLE)
DEF_ICON(ICON_SURFACE_NSURFACE) DEF_ICON(ICON_SURFACE_NSURFACE)
DEF_ICON(ICON_SURFACE_NTUBE) DEF_ICON(ICON_SURFACE_NTUBE)
DEF_ICON(ICON_SURFACE_NSPHERE) DEF_ICON(ICON_SURFACE_NSPHERE)
DEF_ICON(ICON_SURFACE_NDONUT) DEF_ICON(ICON_SURFACE_NTORUS)
DEF_ICON(ICON_BLANK636) DEF_ICON(ICON_BLANK636)
DEF_ICON(ICON_BLANK637) DEF_ICON(ICON_BLANK637)
DEF_ICON(ICON_BLANK638) DEF_ICON(ICON_BLANK638)