From 35337ef2c209f56c0d3637ef2564125c775638d6 Mon Sep 17 00:00:00 2001 From: Howard Stearns Date: Wed, 6 May 2015 12:28:45 -0700 Subject: [PATCH] Spell out order-of-evaluation for the compiler. --- libraries/fbx/src/OBJReader.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libraries/fbx/src/OBJReader.cpp b/libraries/fbx/src/OBJReader.cpp index f78c35b8a0..ebfa9b54f0 100644 --- a/libraries/fbx/src/OBJReader.cpp +++ b/libraries/fbx/src/OBJReader.cpp @@ -101,7 +101,10 @@ bool OBJTokenizer::isNextTokenFloat() { } glm::vec3 OBJTokenizer::getVec3() { - auto v = glm::vec3(getFloat(), getFloat(), getFloat()); // N.B.: getFloat() has side-effect + auto x = getFloat(); // N.B.: getFloat() has side-effect + auto y = getFloat(); // And order of arguments is different on Windows/Linux. + auto z = getFloat(); + auto v = glm::vec3(x, y, z); while (isNextTokenFloat()) { // the spec(s) get(s) vague here. might be w, might be a color... chop it off. nextToken();