diff options
| author | Sven Gothel <[email protected]> | 2013-10-18 09:43:24 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2013-10-18 09:43:24 +0200 |
| commit | c6b8ad4a8972f62fb8d0c1dcd7eca1de24393028 (patch) | |
| tree | b09aac018616200214b8d5518df4dcb2f2c9822a /src/jogl/classes/com/jogamp/opengl/math | |
| parent | 1c51abc1872b3cb984800fd76941a82dacd9e7b1 (diff) | |
| parent | 6aaca0f31eb25938ffab92dd19ffcaacbe5768d9 (diff) | |
Merge remote-tracking branch 'hharrison/master'
Diffstat (limited to 'src/jogl/classes/com/jogamp/opengl/math')
| -rw-r--r-- | src/jogl/classes/com/jogamp/opengl/math/Quaternion.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/jogl/classes/com/jogamp/opengl/math/Quaternion.java b/src/jogl/classes/com/jogamp/opengl/math/Quaternion.java index 78cbb18cf..52a59c599 100644 --- a/src/jogl/classes/com/jogamp/opengl/math/Quaternion.java +++ b/src/jogl/classes/com/jogamp/opengl/math/Quaternion.java @@ -361,7 +361,7 @@ public class Quaternion { y = (m[6] - m[2]) * S; z = (m[1] - m[3]) * S; } else { - if ((m[0] > m[4]) & (m[0] > m[8])) { + if ((m[0] > m[4]) && (m[0] > m[8])) { final float S = FloatUtil.sqrt(1.0f + m[0] - m[4] - m[8]) * 2f; // S=4*qx w = (m[7] - m[5]) / S; x = 0.25f * S; |