aboutsummaryrefslogtreecommitdiffstats
path: root/src/classes/share
diff options
context:
space:
mode:
authorHarvey Harrison <[email protected]>2012-02-16 10:46:44 -0800
committerHarvey Harrison <[email protected]>2012-05-03 18:37:26 -0700
commit4a508a4cc2be536bdbd58d8f46169d6e3ce39d94 (patch)
tree3cad0fa9eafe61138716818fe66a15a8bc483bd7 /src/classes/share
parent7a2c2f5722ad297e0373ca1f31b54a1ab876f67d (diff)
j3dcore: disable all support for GL_NV_register_combiners
- remove ability to enable them using j3d.usecombiners - comment out body of function, remove it from Pipeline entirely later Signed-off-by: Harvey Harrison <[email protected]>
Diffstat (limited to 'src/classes/share')
-rw-r--r--src/classes/share/javax/media/j3d/MasterControl.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/classes/share/javax/media/j3d/MasterControl.java b/src/classes/share/javax/media/j3d/MasterControl.java
index e3fadef..984a93c 100644
--- a/src/classes/share/javax/media/j3d/MasterControl.java
+++ b/src/classes/share/javax/media/j3d/MasterControl.java
@@ -548,9 +548,10 @@ class MasterControl {
"forceReleaseView after Canvas3D dispose enabled",
"forceReleaseView after Canvas3D dispose disabled");
- useCombiners = getBooleanProperty("j3d.usecombiners", useCombiners,
- "Using NV_register_combiners if available",
- "NV_register_combiners disabled");
+// FIXME: GL_NV_register_combiners
+// useCombiners = getBooleanProperty("j3d.usecombiners", useCombiners,
+// "Using NV_register_combiners if available",
+// "NV_register_combiners disabled");
if (getProperty("j3d.disablecompile") != null) {
disableCompile = true;