diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-06-12 20:22:40 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-06-12 20:22:40 +0400 |
| commit | 9f0466fb6bc5db57c1d97a1e36859dc1d50a7228 (patch) | |
| tree | efe9d7d31b061b6d9666dbd8dbdc506a7607311d | |
| parent | ce460c61791c7735c64d62061bcdcd0bc207320e (diff) | |
Quiet double promotion warning & ws edit
| -rw-r--r-- | source/blender/bmesh/tools/bmesh_bevel.c | 2 | ||||
| -rw-r--r-- | source/blender/gpu/intern/gpu_extensions.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c index 45ebe144b5e..4c1ff95a075 100644 --- a/source/blender/bmesh/tools/bmesh_bevel.c +++ b/source/blender/bmesh/tools/bmesh_bevel.c @@ -52,7 +52,7 @@ #define BEVEL_EPSILON_D 1e-6 #define BEVEL_EPSILON 1e-6f #define BEVEL_EPSILON_SQ 1e-12f -#define BEVEL_EPSILON_BIG 1e-4 +#define BEVEL_EPSILON_BIG 1e-4f /* happens far too often, uncomment for development */ // #define BEVEL_ASSERT_PROJECT diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.c index bad561d08c7..a4fddb3d47c 100644 --- a/source/blender/gpu/intern/gpu_extensions.c +++ b/source/blender/gpu/intern/gpu_extensions.c @@ -711,7 +711,7 @@ void GPU_invalid_tex_init(void) void GPU_invalid_tex_bind(int mode) { - switch(mode) { + switch (mode) { case GL_TEXTURE_1D: glBindTexture(GL_TEXTURE_1D, GG.invalid_tex_1D->bindcode); break; |