diff options
| author | Joshua Leung <aligorith@gmail.com> | 2015-12-13 10:33:35 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2015-12-13 10:33:35 +0300 |
| commit | ef2aecf2db981b5344e0d14e7f074f1742b0b2f7 (patch) | |
| tree | d016e95050f10eda7bc44e1bdfa2f7c4fc0fc024 /source/gameengine/Rasterizer/RAS_FramingManager.cpp | |
| parent | cf8980559fdc2e9731d9229512a554212173ea4f (diff) | |
| parent | d9ee88d126ddb59b68d2561694b522a99e4923b6 (diff) | |
Merge branch 'master' into GPencil_Editing_Stage3GPencil_Editing_Stage3
Diffstat (limited to 'source/gameengine/Rasterizer/RAS_FramingManager.cpp')
| -rw-r--r-- | source/gameengine/Rasterizer/RAS_FramingManager.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/gameengine/Rasterizer/RAS_FramingManager.cpp b/source/gameengine/Rasterizer/RAS_FramingManager.cpp index c5f15c9ad21..8b0ec22fde3 100644 --- a/source/gameengine/Rasterizer/RAS_FramingManager.cpp +++ b/source/gameengine/Rasterizer/RAS_FramingManager.cpp @@ -283,14 +283,14 @@ ComputeFrustum( switch (sensor_fit) { case RAS_SENSORFIT_HOR: { - x_scale = 1.0; + x_scale = 1.0f; y_scale = float(viewport.GetHeight()) / float(viewport.GetWidth()); break; } case RAS_SENSORFIT_VERT: { x_scale = float(viewport.GetWidth()) / float(viewport.GetHeight()); - y_scale = 1.0; + y_scale = 1.0f; break; } case RAS_SENSORFIT_AUTO: @@ -377,14 +377,14 @@ RAS_FramingManager:: switch (sensor_fit) { case RAS_SENSORFIT_HOR: { - x_scale = 1.0; + x_scale = 1.0f; y_scale = float(viewport.GetHeight()) / float(viewport.GetWidth()); break; } case RAS_SENSORFIT_VERT: { x_scale = float(viewport.GetWidth()) / float(viewport.GetHeight()); - y_scale = 1.0; + y_scale = 1.0f; break; } case RAS_SENSORFIT_AUTO: |