diff options
| author | Kenneth Russel <[email protected]> | 2007-03-27 05:03:00 +0000 |
|---|---|---|
| committer | Kenneth Russel <[email protected]> | 2007-03-27 05:03:00 +0000 |
| commit | 53ed5970f6025e819c191e5f5f40d180c688b93d (patch) | |
| tree | 8d13d794c73269309bad1b8821ea8730f928b774 /src/net/java/joglutils/msg/nodes/TriangleSet.java | |
| parent | 96a0041f4b46bba34d044ade4d55b6ab58176336 (diff) | |
Made TextureElement refer to the Texture2 node rather than the Texture
it contains
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/joglutils/trunk@48 83d24430-9974-4f80-8418-2cc3294053b9
Diffstat (limited to 'src/net/java/joglutils/msg/nodes/TriangleSet.java')
| -rw-r--r-- | src/net/java/joglutils/msg/nodes/TriangleSet.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/net/java/joglutils/msg/nodes/TriangleSet.java b/src/net/java/joglutils/msg/nodes/TriangleSet.java index 8f708cb..d7c55bb 100644 --- a/src/net/java/joglutils/msg/nodes/TriangleSet.java +++ b/src/net/java/joglutils/msg/nodes/TriangleSet.java @@ -80,7 +80,10 @@ public class TriangleSet extends TriangleBasedShape { if (GLTextureElement.isEnabled(state) && GLTextureCoordinateElement.isEnabled(state)) { - tex = GLTextureElement.get(state); + Texture2 texNode = GLTextureElement.get(state); + if (texNode != null) { + tex = texNode.getTexture(); + } haveTexCoords = (GLTextureCoordinateElement.get(state) != null); } |