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

Rename Beauty Fill to Beautify Fill like in 2.4x, more accurate

Browse Source 
description of what it does since it doesn't actually fill, only
change an existing one.
This commit is contained in:
Brecht Van Lommel
2010-01-26 11:14:44 +00:00
parent 26d8b59864
commit 50e324c5d0
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1276,7 +1276,7 @@ class VIEW3D_MT_edit_mesh_faces(bpy.types.Menu):
# layout.operator("mesh.bevel")
layout.operator("mesh.edge_face_add")
layout.operator("mesh.fill")
layout.operator("mesh.beauty_fill")
layout.operator("mesh.beautify_fill")
layout.operator("mesh.solidify")
layout.separator()

20
source/blender/editors/mesh/editmesh_tools.c
View File

@@ -3399,7 +3399,7 @@ void join_triangles(EditMesh *em)
#define FACE_MARKCLEAR(f) (f->f1 = 1)
/* quick hack, basically a copy of beauty_fill */
/* quick hack, basically a copy of beautify_fill */
void edge_flip(EditMesh *em)
{
EditVert *v1, *v2, *v3, *v4;
@@ -6721,7 +6721,7 @@ void MESH_OT_subdivide(wmOperatorType *ot)
/* note; the EM_selectmode_set() calls here illustrate how badly constructed it all is... from before the
edge/face flags, with very mixed results.... */
static void beauty_fill(EditMesh *em)
static void beautify_fill(EditMesh *em)
{
EditVert *v1, *v2, *v3, *v4;
EditEdge *eed, *nexted;
@@ -6956,7 +6956,7 @@ static void fill_mesh(EditMesh *em)
}
BLI_end_edgefill();
beauty_fill(em);
beautify_fill(em);
WM_cursor_wait(0);
EM_select_flush(em);
@@ -6994,12 +6994,12 @@ void MESH_OT_fill(wmOperatorType *ot)
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
}
static int beauty_fill_exec(bContext *C, wmOperator *op)
static int beautify_fill_exec(bContext *C, wmOperator *op)
{
Object *obedit= CTX_data_edit_object(C);
EditMesh *em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
beauty_fill(em);
beautify_fill(em);
BKE_mesh_end_editmesh(obedit->data, em);
@@ -7009,15 +7009,15 @@ static int beauty_fill_exec(bContext *C, wmOperator *op)
return OPERATOR_FINISHED;
}
void MESH_OT_beauty_fill(wmOperatorType *ot)
void MESH_OT_beautify_fill(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Beauty Fill";
ot->description= "Arrange geometry on a selected surface to avoid skinny faces.";
ot->idname= "MESH_OT_beauty_fill";
ot->name= "Beautify Fill";
ot->description= "Rearrange geometry on a selected surface to avoid skinny faces.";
ot->idname= "MESH_OT_beautify_fill";
/* api callbacks */
ot->exec= beauty_fill_exec;
ot->exec= beautify_fill_exec;
ot->poll= ED_operator_editmesh;
/* flags */

4
source/blender/editors/mesh/mesh_intern.h
View File

@@ -198,7 +198,7 @@ extern EditVert *findnearestvert(ViewContext *vc, int *dist, short sel, short st
void join_triangles(EditMesh *em);
int removedoublesflag(EditMesh *em, short flag, short automerge, float limit); /* return amount */
void esubdivideflag(Object *obedit, EditMesh *em, int flag, float smooth, float fractal, int beauty, int numcuts, int seltype);
void esubdivideflag(Object *obedit, EditMesh *em, int flag, float smooth, float fractal, int beautify, int numcuts, int seltype);
int EdgeSlide(EditMesh *em, struct wmOperator *op, short immediate, float imperc);
void MESH_OT_merge(struct wmOperatorType *ot);
@@ -209,7 +209,7 @@ void MESH_OT_spin(struct wmOperatorType *ot);
void MESH_OT_screw(struct wmOperatorType *ot);
void MESH_OT_fill(struct wmOperatorType *ot);
void MESH_OT_beauty_fill(struct wmOperatorType *ot);
void MESH_OT_beautify_fill(struct wmOperatorType *ot);
void MESH_OT_quads_convert_to_tris(struct wmOperatorType *ot);
void MESH_OT_tris_convert_to_quads(struct wmOperatorType *ot);
void MESH_OT_edge_flip(struct wmOperatorType *ot);

4
source/blender/editors/mesh/mesh_ops.c
View File

@@ -116,7 +116,7 @@ void ED_operatortypes_mesh(void)
WM_operatortype_append(MESH_OT_colors_mirror);
WM_operatortype_append(MESH_OT_fill);
WM_operatortype_append(MESH_OT_beauty_fill);
WM_operatortype_append(MESH_OT_beautify_fill);
WM_operatortype_append(MESH_OT_quads_convert_to_tris);
WM_operatortype_append(MESH_OT_tris_convert_to_quads);
WM_operatortype_append(MESH_OT_edge_flip);
@@ -256,7 +256,7 @@ void ED_keymap_mesh(wmKeyConfig *keyconf)
WM_keymap_add_item(keymap, "MESH_OT_spin", RKEY, KM_PRESS, KM_ALT, 0);
WM_keymap_add_item(keymap, "MESH_OT_fill", FKEY, KM_PRESS, KM_SHIFT, 0);
WM_keymap_add_item(keymap, "MESH_OT_beauty_fill", FKEY, KM_PRESS, KM_ALT, 0);
WM_keymap_add_item(keymap, "MESH_OT_beautify_fill", FKEY, KM_PRESS, KM_ALT, 0);
WM_keymap_add_item(keymap, "MESH_OT_quads_convert_to_tris", TKEY, KM_PRESS, KM_CTRL, 0);
WM_keymap_add_item(keymap, "MESH_OT_tris_convert_to_quads", JKEY, KM_PRESS, KM_ALT, 0);
WM_keymap_add_item(keymap, "MESH_OT_edge_flip", FKEY, KM_PRESS, KM_SHIFT|KM_CTRL, 0);