Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'release/scripts/startup/bl_ui/space_view3d.py')
-rw-r--r--release/scripts/startup/bl_ui/space_view3d.py22
1 files changed, 21 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 155be986ee1..be601d0b6a1 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -1912,6 +1912,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
@@ -1952,6 +1958,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.poke")
layout.operator("mesh.quads_convert_to_tris")
layout.operator("mesh.tris_convert_to_quads")
@@ -2541,17 +2553,25 @@ class VIEW3D_PT_view3d_meshdisplay(Panel):
split = layout.split()
+ with_freestyle = context.scene and bpy.app.build_options.freestyle
+
col = split.column()
col.label(text="Overlays:")
col.prop(mesh, "show_faces", text="Faces")
col.prop(mesh, "show_edges", text="Edges")
col.prop(mesh, "show_edge_crease", text="Creases")
+ if with_freestyle:
+ col.prop(mesh, "show_edge_seams", text="Seams")
col = split.column()
col.label()
- col.prop(mesh, "show_edge_seams", text="Seams")
+ if not with_freestyle:
+ col.prop(mesh, "show_edge_seams", text="Seams")
col.prop(mesh, "show_edge_sharp", text="Sharp", text_ctxt=i18n_contexts.plural)
col.prop(mesh, "show_edge_bevel_weight", text="Weights")
+ if with_freestyle:
+ col.prop(mesh, "show_freestyle_edge_marks", text="Edge Marks")
+ col.prop(mesh, "show_freestyle_face_marks", text="Face Marks")
col = layout.column()