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

UI: rename 'smoothen' to 'smooth'

Browse Source 
Other smooth operators use term 'smooth'.
This commit is contained in:
Campbell Barton
2020-04-07 15:12:18 +10:00
parent a1eb5ec81c
commit 17193f6c76
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/modules/rna_manual_reference.py
View File

@@ -621,7 +621,7 @@ url_manual_mapping = (
("bpy.ops.mesh.dissolve_limited*", "modeling/meshes/editing/mesh/delete.html#bpy-ops-mesh-dissolve-limited"), ("bpy.ops.mesh.dissolve_limited*", "modeling/meshes/editing/mesh/delete.html#bpy-ops-mesh-dissolve-limited"),
("bpy.ops.mesh.face_make_planar*", "modeling/meshes/editing/mesh/cleanup.html#bpy-ops-mesh-face-make-planar"), ("bpy.ops.mesh.face_make_planar*", "modeling/meshes/editing/mesh/cleanup.html#bpy-ops-mesh-face-make-planar"),
("bpy.ops.mesh.paint_mask_slice*", "sculpt_paint/sculpting/hide_mask.html#bpy-ops-mesh-paint-mask-slice"), ("bpy.ops.mesh.paint_mask_slice*", "sculpt_paint/sculpting/hide_mask.html#bpy-ops-mesh-paint-mask-slice"),
("bpy.ops.mesh.smoothen_normals*", "modeling/meshes/editing/mesh/normals.html#bpy-ops-mesh-smoothen-normals"), ("bpy.ops.mesh.smooth_normals*", "modeling/meshes/editing/mesh/normals.html#bpy-ops-mesh-smooth-normals"),
("bpy.ops.object.duplicate_move*", "scene_layout/object/editing/duplicate.html#bpy-ops-object-duplicate-move"), ("bpy.ops.object.duplicate_move*", "scene_layout/object/editing/duplicate.html#bpy-ops-object-duplicate-move"),
("bpy.ops.object.hook_add_selob*", "modeling/meshes/editing/vertex/hooks.html#bpy-ops-object-hook-add-selob"), ("bpy.ops.object.hook_add_selob*", "modeling/meshes/editing/vertex/hooks.html#bpy-ops-object-hook-add-selob"),
("bpy.ops.object.select_by_type*", "scene_layout/object/selecting.html#bpy-ops-object-select-by-type"), ("bpy.ops.object.select_by_type*", "scene_layout/object/selecting.html#bpy-ops-object-select-by-type"),

2
release/scripts/startup/bl_ui/space_view3d.py
View File

@@ -4179,7 +4179,7 @@ class VIEW3D_MT_edit_mesh_normals(Menu):
layout.operator("mesh.normals_tools", text="Copy Vectors").mode = 'COPY' layout.operator("mesh.normals_tools", text="Copy Vectors").mode = 'COPY'
layout.operator("mesh.normals_tools", text="Paste Vectors").mode = 'PASTE' layout.operator("mesh.normals_tools", text="Paste Vectors").mode = 'PASTE'
layout.operator("mesh.smoothen_normals", text="Smoothen Vectors") layout.operator("mesh.smooth_normals", text="Smooth Vectors")
layout.operator("mesh.normals_tools", text="Reset Vectors").mode = 'RESET' layout.operator("mesh.normals_tools", text="Reset Vectors").mode = 'RESET'
layout.separator() layout.separator()

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

@@ -9047,7 +9047,7 @@ void MESH_OT_set_normals_from_faces(struct wmOperatorType *ot)
/** \name Smooth Normal Vectors Operator /** \name Smooth Normal Vectors Operator
* \{ */ * \{ */
static int edbm_smoothen_normals_exec(bContext *C, wmOperator *op) static int edbm_smooth_normals_exec(bContext *C, wmOperator *op)
{ {
ViewLayer *view_layer = CTX_data_view_layer(C); ViewLayer *view_layer = CTX_data_view_layer(C);
uint objects_len = 0; uint objects_len = 0;
@@ -9100,7 +9100,7 @@ static int edbm_smoothen_normals_exec(bContext *C, wmOperator *op)
float current_normal[3]; float current_normal[3];
if (normalize_v3(smooth_normal[i]) < CLNORS_VALID_VEC_LEN) { if (normalize_v3(smooth_normal[i]) < CLNORS_VALID_VEC_LEN) {
/* Skip in case smoothen normal is invalid... */ /* Skip in case the smooth normal is invalid. */
continue; continue;
} }
@@ -9114,7 +9114,7 @@ static int edbm_smoothen_normals_exec(bContext *C, wmOperator *op)
add_v3_v3(current_normal, smooth_normal[i]); add_v3_v3(current_normal, smooth_normal[i]);
if (normalize_v3(current_normal) < CLNORS_VALID_VEC_LEN) { if (normalize_v3(current_normal) < CLNORS_VALID_VEC_LEN) {
/* Skip in case smoothen normal is invalid... */ /* Skip in case the smoothed normal is invalid. */
continue; continue;
} }
@@ -9132,15 +9132,15 @@ static int edbm_smoothen_normals_exec(bContext *C, wmOperator *op)
return OPERATOR_FINISHED; return OPERATOR_FINISHED;
} }
void MESH_OT_smoothen_normals(struct wmOperatorType *ot) void MESH_OT_smooth_normals(struct wmOperatorType *ot)
{ {
/* identifiers */ /* identifiers */
ot->name = "Smooth Normals Vectors"; ot->name = "Smooth Normals Vectors";
ot->description = "Smoothen custom normals based on adjacent vertex normals"; ot->description = "Smooth custom normals based on adjacent vertex normals";
ot->idname = "MESH_OT_smoothen_normals"; ot->idname = "MESH_OT_smooth_normals";
/* api callbacks */ /* api callbacks */
ot->exec = edbm_smoothen_normals_exec; ot->exec = edbm_smooth_normals_exec;
ot->poll = ED_operator_editmesh; ot->poll = ED_operator_editmesh;
/* flags */ /* flags */

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

@@ -248,7 +248,7 @@ void MESH_OT_split_normals(struct wmOperatorType *ot);
void MESH_OT_normals_tools(struct wmOperatorType *ot); void MESH_OT_normals_tools(struct wmOperatorType *ot);
void MESH_OT_set_normals_from_faces(struct wmOperatorType *ot); void MESH_OT_set_normals_from_faces(struct wmOperatorType *ot);
void MESH_OT_average_normals(struct wmOperatorType *ot); void MESH_OT_average_normals(struct wmOperatorType *ot);
void MESH_OT_smoothen_normals(struct wmOperatorType *ot); void MESH_OT_smooth_normals(struct wmOperatorType *ot);
void MESH_OT_mod_weighted_strength(struct wmOperatorType *ot); void MESH_OT_mod_weighted_strength(struct wmOperatorType *ot);
/* *** editmesh_mask_extract.c *** */ /* *** editmesh_mask_extract.c *** */

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

@@ -203,7 +203,7 @@ void ED_operatortypes_mesh(void)
WM_operatortype_append(MESH_OT_normals_tools); WM_operatortype_append(MESH_OT_normals_tools);
WM_operatortype_append(MESH_OT_set_normals_from_faces); WM_operatortype_append(MESH_OT_set_normals_from_faces);
WM_operatortype_append(MESH_OT_average_normals); WM_operatortype_append(MESH_OT_average_normals);
WM_operatortype_append(MESH_OT_smoothen_normals); WM_operatortype_append(MESH_OT_smooth_normals);
WM_operatortype_append(MESH_OT_mod_weighted_strength); WM_operatortype_append(MESH_OT_mod_weighted_strength);
} }