diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-10-13 19:53:08 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-10-13 20:14:33 +0400 |
| commit | f4a260fb3c039d4ad241b87c5951b3348227b056 (patch) | |
| tree | f17a27404ace0925a1824c02cc653939025719df /release/scripts/freestyle | |
| parent | bdc41ca756ab48f0a83b4fd97560969521b4b433 (diff) | |
Fix T42198: Linked lines only work with linked objects.
The reported issue was caused by a backward incompatibility due to careless
code changes made when per-material Freestyle line colors were introduced
in rB7915d7277ac8c605f016f30f943080556244fb59. In 2.71 line style
Material color/alpha/thickness modifiers was retrieving alpha transparency
from Material.alpha, whereas in 2.72 Material.line_color[3] was referenced.
The present fix reverts the aforementioned code changes.
This issue is a regression from 2.71, so the fix is appropriate for inclusion in
the 2.72a release.
Diffstat (limited to 'release/scripts/freestyle')
| -rw-r--r-- | release/scripts/freestyle/modules/freestyle/utils.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/release/scripts/freestyle/modules/freestyle/utils.py b/release/scripts/freestyle/modules/freestyle/utils.py index e0679a53954..6c5e1d5887a 100644 --- a/release/scripts/freestyle/modules/freestyle/utils.py +++ b/release/scripts/freestyle/modules/freestyle/utils.py @@ -217,8 +217,6 @@ def iter_material_value(stroke, func, attribute): # main if attribute == 'LINE': value = rgb_to_bw(*material.line[0:3]) - elif attribute == 'ALPHA': - value = material.line[3] elif attribute == 'DIFF': value = rgb_to_bw(*material.diffuse[0:3]) elif attribute == 'SPEC': @@ -230,6 +228,8 @@ def iter_material_value(stroke, func, attribute): value = material.line[1] elif attribute == 'LINE_B': value = material.line[2] + elif attribute == 'LINE_A': + value = material.line[3] # diffuse seperate elif attribute == 'DIFF_R': value = material.diffuse[0] @@ -237,6 +237,8 @@ def iter_material_value(stroke, func, attribute): value = material.diffuse[1] elif attribute == 'DIFF_B': value = material.diffuse[2] + elif attribute == 'ALPHA': + value = material.diffuse[3] # specular seperate elif attribute == 'SPEC_R': value = material.specular[0] |