Quiet double promotion warning & ws edit
authorCampbell Barton <ideasman42@gmail.com>
Thu, 12 Jun 2014 16:22:40 +0000 (02:22 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 12 Jun 2014 16:22:40 +0000 (02:22 +1000)
source/blender/bmesh/tools/bmesh_bevel.c
source/blender/gpu/intern/gpu_extensions.c

index 45ebe144b5e0d056b730770c6efac87e75664780..4c1ff95a075c314797e40d12f1b17bcc5cd3ed79 100644 (file)
@@ -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
index bad561d08c7fac260fd03ee14a9e6a7f56345add..a4fddb3d47c23568e4cd72a05e4d9fd7e698b1fc 100644 (file)
@@ -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;