diff options
author | YimingWu <xp8110@outlook.com> | 2019-07-16 14:36:44 +0300 |
---|---|---|
committer | YimingWu <xp8110@outlook.com> | 2019-07-16 14:36:44 +0300 |
commit | cb17dba738afbb7f9fdec67180444e8df6557658 (patch) | |
tree | 620a4da674d68598783aefff3818f686e58a5ef7 /source/blender/editors/mesh | |
parent | 9a0c100e6c95bdcd87e6c2858891ea822696b5e4 (diff) | |
parent | 575fff2209f6cb7b9d9ed393c8a5b18d6428814a (diff) |
Merge remote-tracking branch 'origin/greasepencil-object' into soc-2019-npr
Diffstat (limited to 'source/blender/editors/mesh')
-rw-r--r-- | source/blender/editors/mesh/editmesh_tools.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 6f0319223e0..a46dbffbcdd 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -7419,7 +7419,7 @@ void MESH_OT_symmetry_snap(struct wmOperatorType *ot) //#ifdef WITH_FREESTYLE /* -------------------------------------------------------------------- */ -/** \name Mark Edge (FreeStyle) Operator +/** \name Mark Edge (Freestyle) Operator * \{ */ static int edbm_mark_freestyle_edge_exec(bContext *C, wmOperator *op) @@ -7499,7 +7499,7 @@ void MESH_OT_mark_freestyle_edge(wmOperatorType *ot) /** \} */ /* -------------------------------------------------------------------- */ -/** \name Mark Face (FreeStyle) Operator +/** \name Mark Face (Freestyle) Operator * \{ */ static int edbm_mark_freestyle_face_exec(bContext *C, wmOperator *op) |