Merged changes in the trunk up to revision 52191.
[blender-staging.git] / release / scripts / startup / bl_ui / space_view3d.py
index dad3f4a72ef7e208ce18eb8758de668a04fca387..77c0cc7a463ee906839029a6b9c46234881df3bb 100644 (file)
@@ -1838,6 +1838,11 @@ class VIEW3D_MT_edit_mesh_edges(Menu):
 
         layout.separator()
 
+        layout.operator("mesh.mark_freestyle_edge").clear = False
+        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'
 
@@ -1878,6 +1883,11 @@ class VIEW3D_MT_edit_mesh_faces(Menu):
 
         layout.separator()
 
+        layout.operator("mesh.mark_freestyle_face").clear = False
+        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")
 
@@ -2481,6 +2491,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:")