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-09-27 00:14:29 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2013-09-27 00:14:29 +0400
commite424002d307fa278a3ee63901aeca6a76c770248 (patch)
tree7989fb1c7e6265dc0fd0447f519b26dfbd17795a /release/scripts/freestyle
parent226d6fbfc5c91b2ab3f801e26471584cfd795fa5 (diff)
Fix for Freestyle hang up in stroke rendering, due to missing update of 2D stroke length in StorkeCleaner.
Problem report by Light BWK through personal communications, thanks!
Diffstat (limited to 'release/scripts/freestyle')
-rw-r--r--release/scripts/freestyle/style_modules/parameter_editor.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/release/scripts/freestyle/style_modules/parameter_editor.py b/release/scripts/freestyle/style_modules/parameter_editor.py
index f8681d946d8..dd6206fff99 100644
--- a/release/scripts/freestyle/style_modules/parameter_editor.py
+++ b/release/scripts/freestyle/style_modules/parameter_editor.py
@@ -1062,8 +1062,8 @@ class Seed:
_seed = Seed()
-### T.K. 07-Aug-2013 Temporary fix for unexpected line gaps
+### T.K. 07-Aug-2013 Temporary fix for unexpected line gaps
def iter_three_segments(stroke):
n = stroke.stroke_vertices_size()
@@ -1101,6 +1101,7 @@ class StrokeCleaner(StrokeShader):
p3 = mathutils.Vector(sv3.point)
sv2.point = p3
sv3.point = p2
+ stroke.update_length()
# main function for parameter processing
@@ -1233,6 +1234,9 @@ def process(layer_name, lineset_name):
Operators.select(LengthThresholdUP1D(length_min, length_max))
# prepare a list of stroke shaders
shaders_list = []
+ ###
+ shaders_list.append(StrokeCleaner())
+ ###
for m in linestyle.geometry_modifiers:
if not m.use:
continue
@@ -1282,9 +1286,6 @@ def process(layer_name, lineset_name):
elif m.type == '2D_TRANSFORM':
shaders_list.append(Transform2DShader(
m.pivot, m.scale_x, m.scale_y, m.angle, m.pivot_u, m.pivot_x, m.pivot_y))
- ###
- shaders_list.append(StrokeCleaner())
- ###
color = linestyle.color
if (not linestyle.use_chaining) or (linestyle.chaining == 'PLAIN' and linestyle.use_same_object):
thickness_position = linestyle.thickness_position