[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56255] trunk/blender/release/scripts/ freestyle/style_modules/parameter_editor.py: Fix for broken Material color/ alpha/thickness modifiers.
Tamito Kajiyama
rd6t-kjym at asahi-net.or.jp
Wed Apr 24 02:14:17 CEST 2013
Revision: 56255
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56255
Author: kjym3
Date: 2013-04-24 00:14:16 +0000 (Wed, 24 Apr 2013)
Log Message:
-----------
Fix for broken Material color/alpha/thickness modifiers.
Reverted part of the trunk revision 56234 (RNA attribute consistency edits).
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56234
Modified Paths:
--------------
trunk/blender/release/scripts/freestyle/style_modules/parameter_editor.py
Modified: trunk/blender/release/scripts/freestyle/style_modules/parameter_editor.py
===================================================================
--- trunk/blender/release/scripts/freestyle/style_modules/parameter_editor.py 2013-04-23 23:57:27 UTC (rev 56254)
+++ trunk/blender/release/scripts/freestyle/style_modules/parameter_editor.py 2013-04-24 00:14:16 UTC (rev 56255)
@@ -356,9 +356,9 @@
while not it.is_end:
material = func(Interface0DIterator(it))
if material_attribute == 'DIFF':
- color = material.diffuse[:]
+ color = material.diffuse[0:3]
elif material_attribute == 'SPEC':
- color = material.specular[:]
+ color = material.specular[0:3]
else:
raise ValueError("unexpected material attribute: " + material_attribute)
yield it, color
@@ -370,7 +370,7 @@
while not it.is_end:
material = func(Interface0DIterator(it))
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
elif material_attribute == 'DIFF_R':
t = material.diffuse[0]
@@ -379,7 +379,7 @@
elif material_attribute == 'DIFF_B':
t = material.diffuse[2]
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
elif material_attribute == 'SPEC_R':
t = material.specular[0]
More information about the Bf-blender-cvs
mailing list