diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2015-10-28 17:33:16 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-10-29 13:10:17 +0300 |
commit | f30a270a7058d41f758db889028ab23d230a4a0b (patch) | |
tree | ee03a2ae462dce02d3544225c74e481f1734381a | |
parent | 424ea476b1bbb18bce64dd942c17d2a5e5f238d5 (diff) |
Freestyle: Fix for 'Distance from Object' modifiers without a target object.
'Distance from Object' color/alpha/thickness modifiers without a target
object were raising a run-time exception although it is not considered an
error condition.
-rw-r--r-- | release/scripts/freestyle/modules/parameter_editor.py | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/release/scripts/freestyle/modules/parameter_editor.py b/release/scripts/freestyle/modules/parameter_editor.py index fe6c6f641ac..082ce139a59 100644 --- a/release/scripts/freestyle/modules/parameter_editor.py +++ b/release/scripts/freestyle/modules/parameter_editor.py @@ -1406,10 +1406,11 @@ def process(layer_name, lineset_name): shaders_list.append(ColorDistanceFromCameraShader( m.blend, m.influence, m.color_ramp, m.range_min, m.range_max)) - elif m.type == 'DISTANCE_FROM_OBJECT' and m.target is not None: - shaders_list.append(ColorDistanceFromObjectShader( - m.blend, m.influence, m.color_ramp, m.target, - m.range_min, m.range_max)) + elif m.type == 'DISTANCE_FROM_OBJECT': + if m.target is not None: + shaders_list.append(ColorDistanceFromObjectShader( + m.blend, m.influence, m.color_ramp, m.target, + m.range_min, m.range_max)) elif m.type == 'MATERIAL': shaders_list.append(ColorMaterialShader( m.blend, m.influence, m.color_ramp, m.material_attribute, @@ -1439,10 +1440,11 @@ def process(layer_name, lineset_name): shaders_list.append(AlphaDistanceFromCameraShader( m.blend, m.influence, m.mapping, m.invert, m.curve, m.range_min, m.range_max)) - elif m.type == 'DISTANCE_FROM_OBJECT' and m.target is not None: - shaders_list.append(AlphaDistanceFromObjectShader( - m.blend, m.influence, m.mapping, m.invert, m.curve, m.target, - m.range_min, m.range_max)) + elif m.type == 'DISTANCE_FROM_OBJECT': + if m.target is not None: + shaders_list.append(AlphaDistanceFromObjectShader( + m.blend, m.influence, m.mapping, m.invert, m.curve, m.target, + m.range_min, m.range_max)) elif m.type == 'MATERIAL': shaders_list.append(AlphaMaterialShader( m.blend, m.influence, m.mapping, m.invert, m.curve, @@ -1475,11 +1477,12 @@ def process(layer_name, lineset_name): thickness_position, linestyle.thickness_ratio, m.blend, m.influence, m.mapping, m.invert, m.curve, m.range_min, m.range_max, m.value_min, m.value_max)) - elif m.type == 'DISTANCE_FROM_OBJECT' and m.target is not None: - shaders_list.append(ThicknessDistanceFromObjectShader( - thickness_position, linestyle.thickness_ratio, - m.blend, m.influence, m.mapping, m.invert, m.curve, m.target, - m.range_min, m.range_max, m.value_min, m.value_max)) + elif m.type == 'DISTANCE_FROM_OBJECT': + if m.target is not None: + shaders_list.append(ThicknessDistanceFromObjectShader( + thickness_position, linestyle.thickness_ratio, + m.blend, m.influence, m.mapping, m.invert, m.curve, m.target, + m.range_min, m.range_max, m.value_min, m.value_max)) elif m.type == 'MATERIAL': shaders_list.append(ThicknessMaterialShader( thickness_position, linestyle.thickness_ratio, |