diff --git a/java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java b/java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java
index b48b9c2b9..ed9f28adc 100644
--- a/java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java
+++ b/java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java
@@ -3257,11 +3257,19 @@ public class PGraphicsOpenGL extends PGraphics {
     }
     
     modelview.translate(tx, ty, tz);    
-    modelviewInv.invTranslate(tx, ty, tz);    
+    invTranslate(modelviewInv, tx, ty, tz);  
     projmodelview.translate(tx, ty, tz);  
   }
 
   
+  static protected void invTranslate(PMatrix3D matrix, float tx, float ty, float tz) {
+    matrix.preApply(1, 0, 0, -tx,
+                    0, 1, 0, -ty,
+                    0, 0, 1, -tz,
+                    0, 0, 0, 1);
+  }
+  
+  
   /**
    * Two dimensional rotation. Same as rotateZ (this is identical to a 3D
    * rotation along the z-axis) but included for clarity -- it'd be weird for
@@ -3298,11 +3306,25 @@ public class PGraphicsOpenGL extends PGraphics {
     }
 
     modelview.rotate(angle, v0, v1, v2);
-    modelviewInv.invRotate(angle, v0, v1, v2);
+    invRotate(modelviewInv, angle, v0, v1, v2);
     calcProjmodelview(); // Possibly cheaper than doing projmodelview.rotate()
   }
 
   
+  static private void invRotate(PMatrix3D matrix, float angle, float v0, float v1, float v2) {
+    //TODO should make sure this vector is normalized
+
+    float c = PApplet.cos(-angle);
+    float s = PApplet.sin(-angle);
+    float t = 1.0f - c;
+
+    matrix.preApply((t*v0*v0) + c, (t*v0*v1) - (s*v2), (t*v0*v2) + (s*v1), 0,
+                    (t*v0*v1) + (s*v2), (t*v1*v1) + c, (t*v1*v2) - (s*v0), 0,
+                    (t*v0*v2) - (s*v1), (t*v1*v2) + (s*v0), (t*v2*v2) + c, 0,
+                    0, 0, 0, 1);
+  }  
+  
+  
   /**
    * Same as scale(s, s, s).
    */
@@ -3328,11 +3350,16 @@ public class PGraphicsOpenGL extends PGraphics {
     }
 
     modelview.scale(sx, sy, sz);
-    modelviewInv.invScale(sx, sy, sz);    
+    invScale(modelviewInv, sx, sy, sz);   
     projmodelview.scale(sx, sy, sz);    
   }
 
   
+  static protected void invScale(PMatrix3D matrix, float x, float y, float z) {
+    matrix.preApply(1/x, 0, 0, 0,  0, 1/y, 0, 0,  0, 0, 1/z, 0,  0, 0, 0, 1);
+  }
+
+  
   public void shearX(float angle) {
     float t = (float) Math.tan(angle);
     applyMatrix(1, t, 0, 0,