From f7b4d86b7f02174bafe4006144d4f54dbbd55df7 Mon Sep 17 00:00:00 2001 From: Ken Mc Neill Date: Wed, 22 Dec 2010 09:30:34 +0000 Subject: 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 --- .../share/javax/media/j3d/TextureAttributes.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) 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 + } } -- cgit v1.2.3