From cb48c0ceeaf368ef2a13639b68241cdfede62806 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 1 May 2014 07:20:46 +1000 Subject: Revert "Fix msvc 2013 compiler errors after the ingenious cleanup in 4ca67869cc7a." This reverts commit a47a4ef82f37428d391cc14a30fa611d6714e71d. --- source/blender/blenkernel/intern/customdata.c | 1 - source/blender/blenkernel/intern/ipo.c | 1 - source/blender/blenlib/intern/path_util.c | 2 -- source/blender/blenlib/intern/smallhash.c | 1 - source/blender/bmesh/intern/bmesh_mesh.c | 1 - source/blender/editors/interface/interface_style.c | 1 - source/blender/editors/screen/area.c | 1 - source/blender/editors/space_outliner/outliner_tree.c | 1 - source/blender/editors/space_view3d/view3d_ops.c | 1 - source/blender/imbuf/intern/allocimbuf.c | 1 - source/blender/python/intern/bpy_interface.c | 1 - source/blender/python/intern/bpy_rna_array.c | 1 - source/blender/python/intern/bpy_traceback.c | 1 - 13 files changed, 14 deletions(-) diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c index e942e790f05..fd4350123b4 100644 --- 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 cf66d866c2c..6f7ee31691e 100644 --- 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 05415a69489..2c24a8968e9 100644 --- a/source/blender/blenlib/intern/path_util.c +++ b/source/blender/blenlib/intern/path_util.c @@ -36,8 +36,6 @@ #include #include -#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 9177b2fae36..d6b2383bd47 100644 --- 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 70660bba050..e9d3c36eb1a 100644 --- 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 f4efe9d2b22..bbdfd1dcbae 100644 --- 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 04384524241..151764dab6a 100644 --- 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 dbab24daf93..bfa0dcd1c8c 100644 --- 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 7c7730c43f4..4fa995b8799 100644 --- 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 556c4beeae7..ff9bef74a79 100644 --- 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 0c7d942d6bb..90cc07dec89 100644 --- 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 f62d42314e2..a7a3c493f4e 100644 --- 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 81d12e9d9a6..a91742179c9 100644 --- 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" -- cgit v1.2.3