diff options
author | Ken Mc Neill <[email protected]> | 2010-12-22 09:30:34 +0000 |
---|---|---|
committer | Harvey Harrison <[email protected]> | 2011-12-29 17:16:10 -0800 |
commit | f7b4d86b7f02174bafe4006144d4f54dbbd55df7 (patch) | |
tree | 1a90f55aa3475e6e6230ca5d042b34b351827ada /src/classes/share | |
parent | 5ee07aa3ff81dd06c1cea0311f3c243ff1572538 (diff) |
j3dcore: cherry-pick fix for issue 636 from svn-trunk
[original message]
issue 636 fixed by mcneillk
git-svn-id: https://svn.java.net/svn/j3d-core~svn/trunk@954 ba19aa83-45c5-6ac9-afd3-db810772062c
Diffstat (limited to 'src/classes/share')
-rw-r--r-- | src/classes/share/javax/media/j3d/TextureAttributes.java | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/src/classes/share/javax/media/j3d/TextureAttributes.java b/src/classes/share/javax/media/j3d/TextureAttributes.java index 18f1f4c..5610ab1 100644 --- a/src/classes/share/javax/media/j3d/TextureAttributes.java +++ b/src/classes/share/javax/media/j3d/TextureAttributes.java @@ -1432,5 +1432,23 @@ public class TextureAttributes extends NodeComponent { attr.getTextureColorTable(table); rt.initTextureColorTable(table); } + // start fix issue 636 + rt.initCombineRgbMode(attr.getCombineRgbMode()); + rt.initCombineAlphaMode(attr.getCombineAlphaMode()); + + rt.initCombineRgbScale(attr.getCombineRgbScale()); + rt.initCombineAlphaScale(attr.getCombineAlphaScale()); + + // Check one of the combine source or function arrays + if (attr.combineRgbSrc != null) { + for (int i=0; i < 3; i++) { + rt.initCombineRgbSource(i, attr.getCombineRgbSource(i)); + rt.initCombineAlphaSource(i, attr.getCombineAlphaSource(i)); + rt.initCombineRgbFunction(i, attr.getCombineRgbFunction(i)); + rt.initCombineAlphaFunction(i, attr.getCombineAlphaFunction(i)); + } + } + // end fix + } } |