j3dcore: always call Canvas3D freeDisplayList and freeTexture statically

Signed-off-by: Harvey Harrison <[email protected]>

4 files changed, 7 insertions, 7 deletions

diff --git a/src/classes/share/javax/media/j3d/Canvas3D.java b/src/classes/share/javax/media/j3d/Canvas3D.java
index aa05427..e7b9ec8 100644
--- a/src/classes/share/javax/media/j3d/Canvas3D.java
+++ b/src/classes/share/javax/media/j3d/Canvas3D.java
@@ -4504,7 +4504,7 @@ void addTextureResource(int id, TextureRetained obj) {
 		if (val <= 0) {
 		    continue;
 		}
-		freeDisplayList(ctx, val);
+		Canvas3D.freeDisplayList(ctx, val);
 	    }
 	    displayListResourceFreeList.clear();
 	}
@@ -4532,7 +4532,7 @@ void addTextureResource(int id, TextureRetained obj) {
 
                     textureIDResourceTable.set(val, null);
                 }
-                freeTexture(ctx, val);
+                Canvas3D.freeTexture(ctx, val);
             }
             textureIdResourceFreeList.clear();
         }
@@ -4564,7 +4564,7 @@ void addTextureResource(int id, TextureRetained obj) {
             // TODO KCR : determine why this is the case
 //            assert id == ((TextureRetained)obj).objectId;
 
-	    freeTexture(ctx, id);
+		Canvas3D.freeTexture(ctx, id);
 		synchronized (tex.resourceLock) {
 		    tex.resourceCreationMask &= ~canvasBit;
 		    if (tex.resourceCreationMask == 0) {
diff --git a/src/classes/share/javax/media/j3d/J3DGraphics2DImpl.java b/src/classes/share/javax/media/j3d/J3DGraphics2DImpl.java
index fdef542..189e79c 100644
--- a/src/classes/share/javax/media/j3d/J3DGraphics2DImpl.java
+++ b/src/classes/share/javax/media/j3d/J3DGraphics2DImpl.java
@@ -940,7 +940,7 @@ final class J3DGraphics2DImpl extends J3DGraphics2D {
         }
 
         if (objectId != -1) {
-            canvas3d.freeTexture(canvas3d.ctx, objectId);
+        	Canvas3D.freeTexture(canvas3d.ctx, objectId);
             VirtualUniverse.mc.freeTexture2DId(objectId);
             objectId = -1;
         }
diff --git a/src/classes/share/javax/media/j3d/RenderBin.java b/src/classes/share/javax/media/j3d/RenderBin.java
index 379e851..49ee981 100644
--- a/src/classes/share/javax/media/j3d/RenderBin.java
+++ b/src/classes/share/javax/media/j3d/RenderBin.java
@@ -6888,7 +6888,7 @@ void removeNodes(J3dMessage m) {
 		    // Canvas in the renderer.  However, since the
 		    // display lists will be recreated, it doesn't
 		    // really matter.
-		    cv.freeDisplayList(ctx, geo.dlistId);
+			Canvas3D.freeDisplayList(ctx, geo.dlistId);
 		    geo.resourceCreationMask &= ~mask;
 		}
 	    }
diff --git a/src/classes/share/javax/media/j3d/RenderMolecule.java b/src/classes/share/javax/media/j3d/RenderMolecule.java
index 7c9d3fc..81a2456 100644
--- a/src/classes/share/javax/media/j3d/RenderMolecule.java
+++ b/src/classes/share/javax/media/j3d/RenderMolecule.java
@@ -2217,14 +2217,14 @@ class RenderMolecule extends IndexedObject implements ObjectUpdate, NodeComponen
 		while (ra != null) {
 		    id = ra.renderAtom.dlistIds[ra.index];
 		    if (id > 0) {
-			cv.freeDisplayList(ctx, id);
+			Canvas3D.freeDisplayList(ctx, id);
 		    }
 		    ra = ra.next;
 		}
 	    }
 	    else if (primaryMoleculeType == DLIST_MOLECULE) {
 		if (displayListId > 0) {
-		    cv.freeDisplayList(ctx, displayListId);
+			Canvas3D.freeDisplayList(ctx, displayListId);
 		}
 	    }
 	}