[Bf-blender-cvs] [7d062aabac3] soc-2018-npr: turn off freestyle. preserve edge mark ops to to edit older files.

[Nick Wu]

Commit: 7d062aabac36c199f4020bedbd6b75c4b8f7bbcd
Author: Nick Wu
Date:   Thu Jun 21 11:12:21 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rB7d062aabac36c199f4020bedbd6b75c4b8f7bbcd

turn off freestyle. preserve edge mark ops to to edit older files.

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

M	release/scripts/startup/bl_ui/space_view3d.py
M	source/blender/editors/mesh/editmesh_tools.c
M	source/blender/editors/mesh/mesh_intern.h
M	source/blender/editors/mesh/mesh_ops.c

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

diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index e5305bd96ef..7e4da2e0051 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -2821,10 +2821,10 @@ class VIEW3D_MT_edit_mesh_edges_data(Menu):
 
         layout.separator()
 
-        if with_freestyle:
-            layout.operator("mesh.mark_freestyle_edge").clear = False
-            layout.operator("mesh.mark_freestyle_edge", text="Clear Freestyle Edge").clear = True
-            layout.separator()
+        #if with_freestyle:     we still presere freestyle mark functions.
+        layout.operator("mesh.mark_freestyle_edge").clear = False
+        layout.operator("mesh.mark_freestyle_edge", text="Clear Freestyle Edge").clear = True
+        layout.separator()
 
 
 class VIEW3D_MT_edit_mesh_edges(Menu):
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c
index 3fdca4562d1..ef6e360d8cb 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -6748,7 +6748,8 @@ void MESH_OT_symmetry_snap(struct wmOperatorType *ot)
 
 /** \} */
 
-#ifdef WITH_FREESTYLE
+/* preserve the edge marking capability */
+//#ifdef WITH_FREESTYLE
 
 /* -------------------------------------------------------------------- */
 /** \name Mark Edge (FreeStyle) Operator
@@ -6918,4 +6919,4 @@ void MESH_OT_mark_freestyle_face(wmOperatorType *ot)
 
 /** \} */
 
-#endif  /* WITH_FREESTYLE */
+//#endif  /* WITH_FREESTYLE */
diff --git a/source/blender/editors/mesh/mesh_intern.h b/source/blender/editors/mesh/mesh_intern.h
index 75fead00534..44e22a90a0e 100644
--- a/source/blender/editors/mesh/mesh_intern.h
+++ b/source/blender/editors/mesh/mesh_intern.h
@@ -241,10 +241,10 @@ void MESH_OT_merge(struct wmOperatorType *ot);
 void MESH_OT_remove_doubles(struct wmOperatorType *ot);
 void MESH_OT_poke(struct wmOperatorType *ot);
 
-#ifdef WITH_FREESTYLE
+//#ifdef WITH_FREESTYLE
 void MESH_OT_mark_freestyle_edge(struct wmOperatorType *ot);
 void MESH_OT_mark_freestyle_face(struct wmOperatorType *ot);
-#endif
+//#endif
 
 /* *** 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 f5c5a85d5ca..770ea9c2d28 100644
--- a/source/blender/editors/mesh/mesh_ops.c
+++ b/source/blender/editors/mesh/mesh_ops.c
@@ -121,9 +121,9 @@ 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
+//#ifdef WITH_FREESTYLE
 	WM_operatortype_append(MESH_OT_mark_freestyle_face);
-#endif
+//#endif
 
 	WM_operatortype_append(MESH_OT_delete);
 	WM_operatortype_append(MESH_OT_delete_loose);
@@ -140,9 +140,9 @@ 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
+//#ifdef WITH_FREESTYLE
 	WM_operatortype_append(MESH_OT_mark_freestyle_edge);
-#endif
+//#endif
 	WM_operatortype_append(MESH_OT_vertices_smooth);
 	WM_operatortype_append(MESH_OT_vertices_smooth_laplacian);
 	WM_operatortype_append(MESH_OT_flip_normals);