blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

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.
This commit is contained in:
Tamito Kajiyama 2014-06-05 12:55:22 +09:00
parent df94a773b6
commit de280ffa32
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
release/scripts/freestyle/modules/parameter_editor.py
View File

@ -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':