Merge branch 'master' into stable

1 files changed, 3 insertions, 1 deletions

diff --git a/Samples/OculusWorldDemo/Player.h b/Samples/OculusWorldDemo/Player.h
index e1c0437..e57e67c 100644
--- a/Samples/OculusWorldDemo/Player.h
+++ b/Samples/OculusWorldDemo/Player.h
@@ -55,9 +55,11 @@ const float		RailHeight	= 0.8f;
 class Player
 {
 public:
+
+	float				UserEyeHeight;
+
 	// Position and look. The following apply:
     Vector3f            EyePos;
-	float				EyeHeight;
     float               EyeYaw;         // Rotation around Y, CCW positive when looking at RHS (X,Z) plane.
     float               EyePitch;       // Pitch. If sensor is plugged in, only read from sensor.
     float               EyeRoll;        // Roll, only accessible from Sensor.