merged master

Author: Haydelj

src/Interface/Modules/Render/ES/SRCamera.h

@@ -91,7 +91,7 @@ namespace SCIRun{
       float getFOVY()   {return mFOVY;}
       float getAspect() {return static_cast<float>(mInterface.getScreenWidthPixels()) /
                          static_cast<float>(mInterface.getScreenHeightPixels());}
-                         
+
       void setLockZoom(bool lock)     {lockZoom_ = lock;}
       void setLockPanning(bool lock)  {lockPanning_ = lock;}
       void setLockRotation(bool lock) {lockRotation_ = lock;}

src/Interface/Modules/Render/ES/SRInterface.cc

@@ -1370,7 +1370,7 @@ namespace SCIRun {
             // variable.
             gen::StaticScreenDims* dims = mCore.getStaticComponent<gen::StaticScreenDims>();
             float aspect = static_cast<float>(dims->width) / static_cast<float>(dims->height);
-            
+
             // Project onto a orthographic plane with respect to aspect ratio
             glm::mat4 projection = glm::ortho(-aspect/2, aspect/2, -0.5f, 0.5f, 0.0f, 2.0f);