diff options
author | YimingWu <xp8110@outlook.com> | 2019-07-19 05:10:15 +0300 |
---|---|---|
committer | YimingWu <xp8110@outlook.com> | 2019-07-19 11:26:08 +0300 |
commit | a6930680471e5799d536abf766bba2c731cd861c (patch) | |
tree | 0a9e89d1e9aa5b4667c42d331e386cedb93937d3 /source/blender/editors/mesh | |
parent | 3912e4439a48afab13e8e0aaf48a39a32dd33c6e (diff) |
LANPR: Rename freestyle edge mark functions to LANPR.
Diffstat (limited to 'source/blender/editors/mesh')
-rw-r--r-- | source/blender/editors/mesh/editmesh_tools.c | 24 | ||||
-rw-r--r-- | source/blender/editors/mesh/mesh_intern.h | 6 | ||||
-rw-r--r-- | source/blender/editors/mesh/mesh_ops.c | 9 |
3 files changed, 17 insertions, 22 deletions
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index a46dbffbcdd..323b85f9003 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -7422,7 +7422,7 @@ void MESH_OT_symmetry_snap(struct wmOperatorType *ot) /** \name Mark Edge (Freestyle) Operator * \{ */ -static int edbm_mark_freestyle_edge_exec(bContext *C, wmOperator *op) +static int edbm_mark_lanpr_edge_exec(bContext *C, wmOperator *op) { BMEdge *eed; BMIter iter; @@ -7476,17 +7476,17 @@ static int edbm_mark_freestyle_edge_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void MESH_OT_mark_freestyle_edge(wmOperatorType *ot) +void MESH_OT_mark_lanpr_edge(wmOperatorType *ot) { PropertyRNA *prop; /* identifiers */ - ot->name = "Mark Freestyle Edge"; - ot->description = "(Un)mark selected edges as Freestyle feature edges"; - ot->idname = "MESH_OT_mark_freestyle_edge"; + ot->name = "Mark LANPR Edge"; + ot->description = "(Un)mark selected edges as LANPR feature edges"; + ot->idname = "MESH_OT_mark_lanpr_edge"; /* api callbacks */ - ot->exec = edbm_mark_freestyle_edge_exec; + ot->exec = edbm_mark_lanpr_edge_exec; ot->poll = ED_operator_editmesh; /* flags */ @@ -7502,7 +7502,7 @@ void MESH_OT_mark_freestyle_edge(wmOperatorType *ot) /** \name Mark Face (Freestyle) Operator * \{ */ -static int edbm_mark_freestyle_face_exec(bContext *C, wmOperator *op) +static int edbm_mark_lanpr_face_exec(bContext *C, wmOperator *op) { BMFace *efa; BMIter iter; @@ -7554,17 +7554,17 @@ static int edbm_mark_freestyle_face_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void MESH_OT_mark_freestyle_face(wmOperatorType *ot) +void MESH_OT_mark_lanpr_face(wmOperatorType *ot) { PropertyRNA *prop; /* identifiers */ - ot->name = "Mark Freestyle Face"; - ot->description = "(Un)mark selected faces for exclusion from Freestyle feature edge detection"; - ot->idname = "MESH_OT_mark_freestyle_face"; + ot->name = "Mark LANPR Face"; + ot->description = "(Un)mark selected faces for exclusion from LANPR feature edge detection"; + ot->idname = "MESH_OT_mark_lanpr_face"; /* api callbacks */ - ot->exec = edbm_mark_freestyle_face_exec; + ot->exec = edbm_mark_lanpr_face_exec; ot->poll = ED_operator_editmesh; /* flags */ diff --git a/source/blender/editors/mesh/mesh_intern.h b/source/blender/editors/mesh/mesh_intern.h index de4b8d21549..8d585977105 100644 --- a/source/blender/editors/mesh/mesh_intern.h +++ b/source/blender/editors/mesh/mesh_intern.h @@ -246,10 +246,8 @@ void MESH_OT_mod_weighted_strength(struct wmOperatorType *ot); struct wmKeyMap *point_normals_modal_keymap(wmKeyConfig *keyconf); -//#ifdef WITH_FREESTYLE -void MESH_OT_mark_freestyle_edge(struct wmOperatorType *ot); -void MESH_OT_mark_freestyle_face(struct wmOperatorType *ot); -//#endif +void MESH_OT_mark_lanpr_edge(struct wmOperatorType *ot); +void MESH_OT_mark_lanpr_face(struct wmOperatorType *ot); /* *** mesh_data.c *** */ void MESH_OT_uv_texture_add(struct wmOperatorType *ot); diff --git a/source/blender/editors/mesh/mesh_ops.c b/source/blender/editors/mesh/mesh_ops.c index b1b227d5f58..c3387dcfc09 100644 --- a/source/blender/editors/mesh/mesh_ops.c +++ b/source/blender/editors/mesh/mesh_ops.c @@ -114,9 +114,7 @@ void ED_operatortypes_mesh(void) WM_operatortype_append(MESH_OT_faces_shade_smooth); WM_operatortype_append(MESH_OT_faces_shade_flat); WM_operatortype_append(MESH_OT_sort_elements); - //#ifdef WITH_FREESTYLE - WM_operatortype_append(MESH_OT_mark_freestyle_face); - //#endif + WM_operatortype_append(MESH_OT_mark_lanpr_face); WM_operatortype_append(MESH_OT_delete); WM_operatortype_append(MESH_OT_delete_loose); @@ -133,9 +131,8 @@ void ED_operatortypes_mesh(void) WM_operatortype_append(MESH_OT_loop_multi_select); WM_operatortype_append(MESH_OT_mark_seam); WM_operatortype_append(MESH_OT_mark_sharp); - //#ifdef WITH_FREESTYLE - WM_operatortype_append(MESH_OT_mark_freestyle_edge); - //#endif + WM_operatortype_append(MESH_OT_mark_lanpr_edge); + WM_operatortype_append(MESH_OT_vertices_smooth); WM_operatortype_append(MESH_OT_vertices_smooth_laplacian); WM_operatortype_append(MESH_OT_flip_normals); |