aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKevin Rushforth <[email protected]>2007-03-08 21:26:55 +0000
committerKevin Rushforth <[email protected]>2007-03-08 21:26:55 +0000
commit88d9f0a85c8f8ddcfb758676296b86236cffaa2e (patch)
tree75e234b16b8070ce2cc11e18605f12d6d2629bbf /src
parent653015cc1618a83baefca14e0600e68ba4681da3 (diff)
Fixed issue 457: ClassCastException in MasterControl when updating Texture3D
git-svn-id: https://svn.java.net/svn/j3d-core~svn/trunk@789 ba19aa83-45c5-6ac9-afd3-db810772062c
Diffstat (limited to 'src')
-rw-r--r--src/classes/share/javax/media/j3d/RenderBin.java6
-rw-r--r--src/classes/share/javax/media/j3d/Renderer.java4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/classes/share/javax/media/j3d/RenderBin.java b/src/classes/share/javax/media/j3d/RenderBin.java
index 0f2a2e5..56d77fe 100644
--- a/src/classes/share/javax/media/j3d/RenderBin.java
+++ b/src/classes/share/javax/media/j3d/RenderBin.java
@@ -683,7 +683,7 @@ class RenderBin extends J3dStructure implements ObjectUpdate {
Canvas3D canvases[] = view.getCanvases();
for (i = 0; i < size; i++) {
// Evaluate the nodeComponentList for all the canvases
- ImageComponent2DRetained nc = (ImageComponent2DRetained)newNodeComponentList.get(i);
+ ImageComponentRetained nc = (ImageComponentRetained)newNodeComponentList.get(i);
if (nc.isByReference()) {
nc.geomLock.getLock();
for (j = 0; j <canvases.length; j++) {
@@ -723,8 +723,8 @@ class RenderBin extends J3dStructure implements ObjectUpdate {
Canvas3D canvases[] = view.getCanvases();
for (i = 0; i < size; i++) {
// Evaluate the nodeComponentList for all the canvases
- ImageComponent2DRetained nc =
- (ImageComponent2DRetained)dirtyNodeComponentList.get(i);
+ ImageComponentRetained nc =
+ (ImageComponentRetained)dirtyNodeComponentList.get(i);
if (nc.isByReference()) {
nc.geomLock.getLock();
for (j = 0; j <canvases.length; j++) {
diff --git a/src/classes/share/javax/media/j3d/Renderer.java b/src/classes/share/javax/media/j3d/Renderer.java
index 82f69b6..f1c283d 100644
--- a/src/classes/share/javax/media/j3d/Renderer.java
+++ b/src/classes/share/javax/media/j3d/Renderer.java
@@ -921,8 +921,8 @@ class Renderer extends J3dThread {
if (renderBin.nodeComponentList.size() > 0) {
for (i = 0; i < renderBin.nodeComponentList.size(); i++) {
NodeComponentRetained nc = (NodeComponentRetained)renderBin.nodeComponentList.get(i);
- if(nc instanceof ImageComponent2DRetained) {
- ((ImageComponent2DRetained)nc).evaluateExtensions(canvas);
+ if(nc instanceof ImageComponentRetained) {
+ ((ImageComponentRetained)nc).evaluateExtensions(canvas);
}
}
}