Merged changes in the trunk up to revision 44039.
[blender-staging.git] / release / scripts / startup / bl_ui / space_view3d.py
index 93cec3326db3936b79ded72b9219cc40b27104b6..5bd46856c9286574ee967e127608c2e16d5097bd 100644 (file)
@@ -1632,6 +1632,11 @@ class VIEW3D_MT_edit_mesh_edges(Menu):
 
         layout.separator()
 
+        layout.operator("mesh.mark_freestyle_edge")
+        layout.operator("mesh.mark_freestyle_edge", text="Clear Freestyle Edge").clear = True
+
+        layout.separator()
+
         layout.operator("mesh.edge_rotate", text="Rotate Edge CW").direction = 'CW'
         layout.operator("mesh.edge_rotate", text="Rotate Edge CCW").direction = 'CCW'
 
@@ -1674,6 +1679,11 @@ class VIEW3D_MT_edit_mesh_faces(Menu):
 
         layout.separator()
 
+        layout.operator("mesh.mark_freestyle_face")
+        layout.operator("mesh.mark_freestyle_face", text="Clear Freestyle Face").clear = True
+
+        layout.separator()
+
         layout.operator("mesh.quads_convert_to_tris")
         layout.operator("mesh.tris_convert_to_quads")
         layout.operator("mesh.edge_flip")
@@ -2243,6 +2253,8 @@ class VIEW3D_PT_view3d_meshdisplay(Panel):
         col.prop(mesh, "show_edge_bevel_weight", text="Bevel Weights")
         col.prop(mesh, "show_edge_seams", text="Seams")
         col.prop(mesh, "show_edge_sharp", text="Sharp")
+        col.prop(mesh, "show_freestyle_edge_marks", text="Freestyle Edge Marks")
+        col.prop(mesh, "show_freestyle_face_marks", text="Freestyle Face Marks")
 
         col.separator()
         col.label(text="Normals:")