diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-07-19 03:03:27 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-07-19 03:03:27 +0400 |
| commit | d0e892a7286791a4b2d1c5d7321fe8fe040819dd (patch) | |
| tree | 43a9024562d8272d3211e75bea0b614d286196c8 /source/gameengine/BlenderRoutines | |
| parent | db14b97be6917d961c893ba6e0188c927ffa67b0 (diff) | |
quiet double promotion warnings for the game engine.
Diffstat (limited to 'source/gameengine/BlenderRoutines')
| -rw-r--r-- | source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp | 5 | ||||
| -rw-r--r-- | source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp | 3 |
2 files changed, 1 insertions, 7 deletions
diff --git a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp index 8b211385928..8e2ff06a55c 100644 --- a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp +++ b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp @@ -82,10 +82,6 @@ extern "C" { /* #include "BKE_screen.h" */ /* cant include this because of 'new' function name */ extern float BKE_screen_view3d_zoom_to_fac(float camzoom); - -//XXX #include "BIF_screen.h" -//XXX #include "BIF_scrarea.h" - #include "BKE_main.h" #include "BLI_blenlib.h" #include "BLO_readfile.h" @@ -93,7 +89,6 @@ extern float BKE_screen_view3d_zoom_to_fac(float camzoom); #include "BKE_ipo.h" /***/ -//XXX #include "BSE_headerbuttons.h" #include "BKE_context.h" #include "../../blender/windowmanager/WM_types.h" #include "../../blender/windowmanager/wm_window.h" diff --git a/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp b/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp index 9156102ab0d..1266250e942 100644 --- a/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp +++ b/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp @@ -383,8 +383,7 @@ void KX_BlenderRenderTools::MotionBlur(RAS_IRasterizer* rasterizer) glAccum(GL_LOAD, 1.0); rasterizer->SetMotionBlurState(2); } - else if (motionblurvalue>=0.0 && motionblurvalue<=1.0) - { + else if (motionblurvalue >= 0.0f && motionblurvalue <= 1.0f) { glAccum(GL_MULT, motionblurvalue); glAccum(GL_ACCUM, 1-motionblurvalue); glAccum(GL_RETURN, 1.0); |