Merged changes in the trunk up to revision 55357.
[blender-staging.git] / release / scripts / startup / bl_ui / space_view3d.py
index 05acc26c011618b1b3e9bbfdca4d7834eb68abec..7ecf2249b5c11243f27c88db56f04bef90ca3478 100644 (file)
@@ -1902,6 +1902,12 @@ class VIEW3D_MT_edit_mesh_edges(Menu):
 
         layout.separator()
 
+        if context.scene and bpy.app.build_options.freestyle:
+            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").use_ccw = False
         layout.operator("mesh.edge_rotate", text="Rotate Edge CCW").use_ccw = True
 
@@ -1942,6 +1948,12 @@ class VIEW3D_MT_edit_mesh_faces(Menu):
 
         layout.separator()
 
+        if context.scene and bpy.app.build_options.freestyle:
+            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")
 
@@ -2542,6 +2554,10 @@ class VIEW3D_PT_view3d_meshdisplay(Panel):
         col.prop(mesh, "show_edge_sharp", text="Sharp")
         col.prop(mesh, "show_edge_bevel_weight", text="Weights")
 
+        if context.scene and bpy.app.build_options.freestyle:
+            col.prop(mesh, "show_freestyle_edge_marks", text="Freestyle Edge Marks")
+            col.prop(mesh, "show_freestyle_face_marks", text="Freestyle Face Marks")
+        
         col = layout.column()
 
         col.separator()