Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix for broken Material color/alpha/thickness modifiers.

Browse Source 
Reverted part of the trunk revision 56234 (RNA attribute consistency edits).
This commit is contained in:
Tamito Kajiyama
2013-04-24 00:14:16 +00:00
parent b64ec6c51e
commit ad6cc0d0ac
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
release/scripts/freestyle/style_modules/parameter_editor.py
View File

@@ -356,9 +356,9 @@ def iter_material_color(stroke, material_attribute):
while not it.is_end: while not it.is_end:
material = func(Interface0DIterator(it)) material = func(Interface0DIterator(it))
if material_attribute == 'DIFF': if material_attribute == 'DIFF':
color = material.diffuse[:] color = material.diffuse[0:3]
elif material_attribute == 'SPEC': elif material_attribute == 'SPEC':
color = material.specular[:] color = material.specular[0:3]
else: else:
raise ValueError("unexpected material attribute: " + material_attribute) raise ValueError("unexpected material attribute: " + material_attribute)
yield it, color yield it, color
@@ -370,7 +370,7 @@ def iter_material_value(stroke, material_attribute):
while not it.is_end: while not it.is_end:
material = func(Interface0DIterator(it)) material = func(Interface0DIterator(it))
if material_attribute == 'DIFF': if material_attribute == 'DIFF':
r, g, b = material.diffuse r, g, b = material.diffuse[0:3]
t = 0.35 * r + 0.45 * r + 0.2 * b t = 0.35 * r + 0.45 * r + 0.2 * b
elif material_attribute == 'DIFF_R': elif material_attribute == 'DIFF_R':
t = material.diffuse[0] t = material.diffuse[0]
@@ -379,7 +379,7 @@ def iter_material_value(stroke, material_attribute):
elif material_attribute == 'DIFF_B': elif material_attribute == 'DIFF_B':
t = material.diffuse[2] t = material.diffuse[2]
elif material_attribute == 'SPEC': elif material_attribute == 'SPEC':
r, g, b = material.specular r, g, b = material.specular[0:3]
t = 0.35 * r + 0.45 * r + 0.2 * b t = 0.35 * r + 0.45 * r + 0.2 * b
elif material_attribute == 'SPEC_R': elif material_attribute == 'SPEC_R':
t = material.specular[0] t = material.specular[0]