From fe3b5d1867d68e02ffa89fd3cc6d01adef75844b Mon Sep 17 00:00:00 2001 From: Sam Gateau Date: Wed, 6 May 2015 10:27:31 -0700 Subject: [PATCH] preparing for PR, back to the default background mode SKy_DOME --- libraries/gpu/src/gpu/Texture.h | 2 +- libraries/model/src/model/Stage.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/gpu/src/gpu/Texture.h b/libraries/gpu/src/gpu/Texture.h index 5523f7f417..995196060f 100755 --- a/libraries/gpu/src/gpu/Texture.h +++ b/libraries/gpu/src/gpu/Texture.h @@ -184,7 +184,7 @@ public: uint32 getRowPitch() const { return getWidth() * getTexelFormat().getSize(); } // The number of faces is mostly used for cube map, and maybe for stereo ? otherwise it's 1 - // For cube maps, this means the pixels of the different faces are supposed to bepacked back to back in a mip + // For cube maps, this means the pixels of the different faces are supposed to be packed back to back in a mip // as if the height was NUM_FACES time bigger. static uint8 NUM_FACES_PER_TYPE[NUM_TYPES]; uint8 getNumFaces() const { return NUM_FACES_PER_TYPE[getType()]; } diff --git a/libraries/model/src/model/Stage.h b/libraries/model/src/model/Stage.h index d22269bece..b28c20fc65 100644 --- a/libraries/model/src/model/Stage.h +++ b/libraries/model/src/model/Stage.h @@ -223,7 +223,7 @@ public: const SkyboxPointer& getSkybox() const { valid(); return _skybox; } protected: - BackgroundMode _backgroundMode = SKY_BOX; + BackgroundMode _backgroundMode = SKY_DOME; LightPointer _sunLight; AtmospherePointer _atmosphere;