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>2012-11-05 03:52:26 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2012-11-05 03:52:26 +0400
commitdd633f1affc8951a0a6ba19cdffbb58ac7f54acd (patch)
treef6290998a6d4cea5fc8d8dbc11a99ecddd6a5125 /release/scripts/startup/bl_ui/properties_render_layer.py
parenta9055460a92397d8110289167719d616ce3f0399 (diff)
Fix for dashed line options not working as expected in some applications
when combined with geometry modifiers. The problem is that users were not able to choose the time when the dashed line options are applied. Instead, the dashed line options were applied only before geometry modifiers were employed. Since dashes were separate strokes, the geometry modifiers were processed dash by dash. Depending on users' artistic intention, this may or may not lead to expected stylization results, as reported by octane98 in the BlenderArtists Freestyle thread on January 3, 2012. http://blenderartists.org/forum/showthread.php?89986-Freestyle-for-Blender&p=2018592&viewfull=1#post2018592 Now the Strokes tab of the Freestyle Line Style panel has two sets of dashed line options. One is in the Splitting section of the Strokes tab and used for splitting strokes by dashed line patterns. The other set is called "Dashed Line" and used to generate dashed lines based on the strokes after the geometry modifiers are applied. The two sets of dashed line options are independent of each other, so that users can enable one of them as well as both at the same time.
Diffstat (limited to 'release/scripts/startup/bl_ui/properties_render_layer.py')
-rw-r--r--release/scripts/startup/bl_ui/properties_render_layer.py10
1 files changed, 10 insertions, 0 deletions
diff --git a/release/scripts/startup/bl_ui/properties_render_layer.py b/release/scripts/startup/bl_ui/properties_render_layer.py
index 940d5f0d631..631c636a783 100644
--- a/release/scripts/startup/bl_ui/properties_render_layer.py
+++ b/release/scripts/startup/bl_ui/properties_render_layer.py
@@ -620,6 +620,7 @@ class RENDERLAYER_PT_freestyle_linestyle(RenderLayerButtonsPanel, Panel):
subsub = sub.row()
subsub.enabled = linestyle.use_max_angle
subsub.prop(linestyle, "max_angle")
+ col.prop(linestyle, "use_split_pattern", text="Split Pattern")
col = row.column()
sub = col.row(align=True)
sub.prop(linestyle, "use_split_length", text="")
@@ -627,6 +628,15 @@ class RENDERLAYER_PT_freestyle_linestyle(RenderLayerButtonsPanel, Panel):
subsub.enabled = linestyle.use_split_length
subsub.prop(linestyle, "split_length", text="2D Length")
col.prop(linestyle, "material_boundary")
+ row = layout.row(align=True)
+ row.enabled = linestyle.use_split_pattern
+ row.prop(linestyle, "split_dash1")
+ row.prop(linestyle, "split_gap1")
+ row.prop(linestyle, "split_dash2")
+ row.prop(linestyle, "split_gap2")
+ row.prop(linestyle, "split_dash3")
+ row.prop(linestyle, "split_gap3")
+
# Selection
layout.label(text="Selection:")
row = layout.row()