[Bf-blender-cvs] [f30a270] blender-v2.76a-release: Freestyle: Fix for 'Distance from Object' modifiers without a target object.

[Tamito Kajiyama]

Commit: f30a270a7058d41f758db889028ab23d230a4a0b
Author: Tamito Kajiyama
Date:   Wed Oct 28 23:33:16 2015 +0900
Branches: blender-v2.76a-release
https://developer.blender.org/rBf30a270a7058d41f758db889028ab23d230a4a0b

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.

===================================================================

M	release/scripts/freestyle/modules/parameter_editor.py

===================================================================

diff --git a/release/scripts/freestyle/modules/parameter_editor.py b/release/scripts/freestyle/modules/parameter_editor.py
index fe6c6f6..082ce13 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,