[Bf-blender-cvs] [9f0466f] master: Quiet double promotion warning & ws edit

[Campbell Barton]

Commit: 9f0466fb6bc5db57c1d97a1e36859dc1d50a7228
Author: Campbell Barton
Date:   Fri Jun 13 02:22:40 2014 +1000
https://developer.blender.org/rB9f0466fb6bc5db57c1d97a1e36859dc1d50a7228

Quiet double promotion warning & ws edit

===================================================================

M	source/blender/bmesh/tools/bmesh_bevel.c
M	source/blender/gpu/intern/gpu_extensions.c

===================================================================

diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c
index 45ebe14..4c1ff95 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 bad561d..a4fddb3 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;