Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenkernel/BKE_pbvh.h4
-rw-r--r--source/blender/blenlib/BLI_winstuff.h4
-rw-r--r--source/blender/blenlib/intern/freetypefont.c5
-rw-r--r--source/blender/blenlib/intern/noise.c6
4 files changed, 1 insertions, 18 deletions
diff --git a/source/blender/blenkernel/BKE_pbvh.h b/source/blender/blenkernel/BKE_pbvh.h
index 1a2d6469a29..34e96599b7e 100644
--- a/source/blender/blenkernel/BKE_pbvh.h
+++ b/source/blender/blenkernel/BKE_pbvh.h
@@ -256,10 +256,6 @@ typedef struct PBVHVertexIter {
float *mask;
} PBVHVertexIter;
-#ifdef _MSC_VER
-#pragma warning (disable:4127) // conditional expression is constant
-#endif
-
void pbvh_vertex_iter_init(PBVH *bvh, PBVHNode *node,
PBVHVertexIter *vi, int mode);
diff --git a/source/blender/blenlib/BLI_winstuff.h b/source/blender/blenlib/BLI_winstuff.h
index 1959d5171fb..f615e5a9300 100644
--- a/source/blender/blenlib/BLI_winstuff.h
+++ b/source/blender/blenlib/BLI_winstuff.h
@@ -37,9 +37,7 @@
# error "This include is for Windows only!"
#endif
-#ifndef FREE_WINDOWS
-# pragma warning(once: 4761 4305 4244 4018)
-#else
+#ifdef FREE_WINDOWS
# ifdef WINVER
# undef WINVER
# endif
diff --git a/source/blender/blenlib/intern/freetypefont.c b/source/blender/blenlib/intern/freetypefont.c
index 43cf6c665c2..4680cfc1add 100644
--- a/source/blender/blenlib/intern/freetypefont.c
+++ b/source/blender/blenlib/intern/freetypefont.c
@@ -32,11 +32,6 @@
* \ingroup bli
*/
-
-#ifdef _MSC_VER
-# pragma warning (disable:4244)
-#endif
-
#include <ft2build.h>
#include FT_FREETYPE_H
/* not needed yet */
diff --git a/source/blender/blenlib/intern/noise.c b/source/blender/blenlib/intern/noise.c
index 5b9fefe77bb..982a74b1ffd 100644
--- a/source/blender/blenlib/intern/noise.c
+++ b/source/blender/blenlib/intern/noise.c
@@ -30,12 +30,6 @@
* \ingroup bli
*/
-
-#ifdef _MSC_VER
-# pragma warning (disable:4244) /* "conversion from double to float" */
-# pragma warning (disable:4305) /* "truncation from const double to float" */
-#endif
-
#include <math.h>
#include "BLI_noise.h"