[Bf-blender-cvs] [cb17dba738a] soc-2019-npr: Merge remote-tracking branch 'origin/greasepencil-object' into soc-2019-npr

[YimingWu]

Commit: cb17dba738afbb7f9fdec67180444e8df6557658
Author: YimingWu
Date:   Tue Jul 16 19:36:44 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rBcb17dba738afbb7f9fdec67180444e8df6557658

Merge remote-tracking branch 'origin/greasepencil-object' into soc-2019-npr

===================================================================



===================================================================

diff --cc source/blender/editors/mesh/editmesh_tools.c
index 6f0319223e0,919de4cdb20..a46dbffbcdd
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@@ -7415,11 -7415,10 +7415,11 @@@ void MESH_OT_symmetry_snap(struct wmOpe
  
  /** \} */
  
 -#ifdef WITH_FREESTYLE
 +/* preserve the edge marking capability */
 +//#ifdef WITH_FREESTYLE
  
  /* -------------------------------------------------------------------- */
- /** \name Mark Edge (FreeStyle) Operator
+ /** \name Mark Edge (Freestyle) Operator
   * \{ */
  
  static int edbm_mark_freestyle_edge_exec(bContext *C, wmOperator *op)