Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Jeffrey Ventrella 2013-05-20 12:16:40 -07:00
commit 545b928971

View file

@ -51,7 +51,9 @@ public:
_cameraFarClip(0.0f),
_keyState(NO_KEY_DOWN),
_wantResIn(false),
_wantColor(true) { };
_wantColor(true),
_wantDelta(false)
{ };
const glm::vec3& getPosition() const { return _position; }