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>2014-06-05 07:55:22 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2014-06-05 07:56:49 +0400
commitde280ffa32e48f1526ffe259d448673f1019ad0f (patch)
tree9e7643eff8962425bb2ce8e5b954613f400cd2e3 /release/scripts/freestyle/modules/parameter_editor.py
parentdf94a773b6bc8e63dfeb4d7c09e1f8a7583c0c56 (diff)
Freestyle: Fix for a wrong formula used for RGB to grayscale conversion.
This bug fix is likely to affect the visual results of existing Freestyle setups using the Material color/alpha/thickness modifiers with the 'material_attribute' parameter set to either 'Diffuse' (default) or 'Specular', and also the Ramp option enabled in the case of the Material color modifier.
Diffstat (limited to 'release/scripts/freestyle/modules/parameter_editor.py')
-rw-r--r--release/scripts/freestyle/modules/parameter_editor.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/release/scripts/freestyle/modules/parameter_editor.py b/release/scripts/freestyle/modules/parameter_editor.py
index 38203e9723b..34645b9cb62 100644
--- a/release/scripts/freestyle/modules/parameter_editor.py
+++ b/release/scripts/freestyle/modules/parameter_editor.py
@@ -464,7 +464,7 @@ def iter_material_value(stroke, material_attribute):
material = func(Interface0DIterator(it))
if material_attribute == 'DIFF':
r, g, b = material.diffuse[0:3]
- t = 0.35 * r + 0.45 * r + 0.2 * b
+ t = 0.35 * r + 0.45 * g + 0.2 * b
elif material_attribute == 'DIFF_R':
t = material.diffuse[0]
elif material_attribute == 'DIFF_G':
@@ -473,7 +473,7 @@ def iter_material_value(stroke, material_attribute):
t = material.diffuse[2]
elif material_attribute == 'SPEC':
r, g, b = material.specular[0:3]
- t = 0.35 * r + 0.45 * r + 0.2 * b
+ t = 0.35 * r + 0.45 * g + 0.2 * b
elif material_attribute == 'SPEC_R':
t = material.specular[0]
elif material_attribute == 'SPEC_G':