Revert "Fix msvc 2013 compiler errors after the ingenious cleanup in 4ca67869cc7a."

This reverts commit a47a4ef82f37428d391cc14a30fa611d6714e71d.

diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c
index e942e790f0577d2b1e3b63c38fb689c7e4b67732..fd4350123b43ffd801a167675b1f101d49680828 100644 (file)
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -49,7 +49,6 @@
 #include "BLI_path_util.h"
 #include "BLI_math.h"
 #include "BLI_mempool.h"
-#include "BLI_alloca.h"
 
 #include "BLF_translation.h"
 

diff --git a/source/blender/blenkernel/intern/ipo.c b/source/blender/blenkernel/intern/ipo.c
index cf66d866c2cd1ed74c3cbef9ed1ce5612cd36188..6f7ee31691e0898628b339a9d1a80d2623e773b3 100644 (file)
--- a/source/blender/blenkernel/intern/ipo.c
+++ b/source/blender/blenkernel/intern/ipo.c
@@ -60,7 +60,6 @@
 #include "DNA_world_types.h"
 #include "DNA_object_types.h"
 
-#include "BLI_math.h" /* windows needs for M_PI */
 #include "BLI_blenlib.h"
 #include "BLI_dynstr.h"
 #include "BLI_utildefines.h"

diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c
index 05415a6948944a5d24f9a2b800c0ff8eef0f64ab..2c24a8968e9bd08e9bbd16cd87ce703ccaac603e 100644 (file)
--- a/source/blender/blenlib/intern/path_util.c
+++ b/source/blender/blenlib/intern/path_util.c
@@ -36,8 +36,6 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "MEM_guardedalloc.h"
-
 #include "DNA_listBase.h"
 
 #include "BLI_utildefines.h"

diff --git a/source/blender/blenlib/intern/smallhash.c b/source/blender/blenlib/intern/smallhash.c
index 9177b2fae3615ce2f4624b1d12b66295bd891c14..d6b2383bd479e7e9e539732286d316956fbec52f 100644 (file)
--- a/source/blender/blenlib/intern/smallhash.c
+++ b/source/blender/blenlib/intern/smallhash.c
@@ -55,7 +55,6 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_utildefines.h"
-#include "BLI_alloca.h"
 
 #include "BLI_smallhash.h"
 

diff --git a/source/blender/bmesh/intern/bmesh_mesh.c b/source/blender/bmesh/intern/bmesh_mesh.c
index 70660bba050583abcd5133635a01d75b829f6298..e9d3c36eb1a315c92e0ab2d687f4ca8ff07920d4 100644 (file)
--- a/source/blender/bmesh/intern/bmesh_mesh.c
+++ b/source/blender/bmesh/intern/bmesh_mesh.c
@@ -35,7 +35,6 @@
 #include "BLI_listbase.h"
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
-#include "BLI_alloca.h"
 
 #include "BKE_cdderivedmesh.h"
 #include "BKE_editmesh.h"

diff --git a/source/blender/editors/interface/interface_style.c b/source/blender/editors/interface/interface_style.c
index f4efe9d2b22c6367781ab95e4e4905e06ef48930..bbdfd1dcbae3a9e9ef6109c398b8ce43f75d9f2a 100644 (file)
--- a/source/blender/editors/interface/interface_style.c
+++ b/source/blender/editors/interface/interface_style.c
@@ -38,7 +38,6 @@
 #include "DNA_screen_types.h"
 #include "DNA_userdef_types.h"
 
-#include "BLI_math.h"
 #include "BLI_listbase.h"
 #include "BLI_rect.h"
 #include "BLI_string.h"

diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c
index 04384524241a936024c092ff2827f6692726c155..151764dab6aa4d23abf511ba620205dbc1c44d7c 100644 (file)
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/screen/area.c
@@ -36,7 +36,6 @@
 
 #include "DNA_userdef_types.h"
 
-#include "BLI_alloca.h"
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_utildefines.h"

diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c
index dbab24daf936c12bf63b00ffa7b34f86215d85d7..bfa0dcd1c8ce5246c83f4bb01819c13fd64105d1 100644 (file)
--- a/source/blender/editors/space_outliner/outliner_tree.c
+++ b/source/blender/editors/space_outliner/outliner_tree.c
@@ -54,7 +54,6 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_utildefines.h"
-#include "BLI_math.h"
 #include "BLI_mempool.h"
 #include "BLI_fnmatch.h"
 

diff --git a/source/blender/editors/space_view3d/view3d_ops.c b/source/blender/editors/space_view3d/view3d_ops.c
index 7c7730c43f45f3519e17f0cba301661e1d9f25b9..4fa995b87990efe885067fa1ffc3a7450b5ba022 100644 (file)
--- a/source/blender/editors/space_view3d/view3d_ops.c
+++ b/source/blender/editors/space_view3d/view3d_ops.c
@@ -39,7 +39,6 @@
 #include "DNA_space_types.h"
 #include "DNA_view3d_types.h"
 
-#include "BLI_math.h"
 #include "BLI_blenlib.h"
 #include "BLI_utildefines.h"
 

diff --git a/source/blender/imbuf/intern/allocimbuf.c b/source/blender/imbuf/intern/allocimbuf.c
index 556c4beeae7a523c5252c35b529a81c3a66e921b..ff9bef74a79779d6bd10838689ab74c7179a8abd 100644 (file)
--- a/source/blender/imbuf/intern/allocimbuf.c
+++ b/source/blender/imbuf/intern/allocimbuf.c
@@ -47,7 +47,6 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_utildefines.h"
 #include "BLI_threads.h"
 
 static SpinLock refcounter_spin;

diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c
index 0c7d942d6bb470bb3376f4478a4c340736b8206e..90cc07dec895d5b2ec30085bb0b4ecc627f334d1 100644 (file)
--- a/source/blender/python/intern/bpy_interface.c
+++ b/source/blender/python/intern/bpy_interface.c
@@ -43,7 +43,6 @@
 #include "BLI_path_util.h"
 #include "BLI_fileops.h"
 #include "BLI_listbase.h"
-#include "BLI_math_base.h"
 #include "BLI_string.h"
 #include "BLI_string_utf8.h"
 #include "BLI_threads.h"

diff --git a/source/blender/python/intern/bpy_rna_array.c b/source/blender/python/intern/bpy_rna_array.c
index f62d42314e2faef83a01b0675a02811558f77134..a7a3c493f4e5cdc633007717da34060e1cd8f065 100644 (file)
--- a/source/blender/python/intern/bpy_rna_array.c
+++ b/source/blender/python/intern/bpy_rna_array.c
@@ -30,7 +30,6 @@
 
 #include "RNA_types.h"
 
-#include "BLI_utildefines.h"
 
 #include "bpy_rna.h"
 #include "BKE_global.h"

diff --git a/source/blender/python/intern/bpy_traceback.c b/source/blender/python/intern/bpy_traceback.c
index 81d12e9d9a6b6451a17f4ac74924cfa964fff6af..a91742179c9af9b4ca7a7a71fded13918289ae6c 100644 (file)
--- a/source/blender/python/intern/bpy_traceback.c
+++ b/source/blender/python/intern/bpy_traceback.c
@@ -31,7 +31,6 @@
 
 #include "BLI_utildefines.h"
 #include "BLI_path_util.h"
-#include "BLI_string.h"
 
 #include "bpy_traceback.h"