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:
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2013-03-26 04:32:19 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2013-03-26 04:32:19 +0400
commitd88a3ab4278b23a3f2d4e0020692a6470fd0e200 (patch)
treec8a5f51a9cec8116996088abff7e2cf687d9c3d1 /release
parent385c72f5f26ae9c86bf40c127c44216ceea0e6c1 (diff)
Fix for truncated labels in the 3D View properties panel.
Suggested by Bastien Montagne and IRIE Shinsuke through a code review of the branch.
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/space_view3d.py14
1 files changed, 9 insertions, 5 deletions
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 08c161f65d8..e474117f0d4 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -2547,21 +2547,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")
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")
+ 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()