From a91d538f47171a40463016b91c22d39d694d923a Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 16 Aug 2010 09:24:18 +0000 Subject: - commit that removed MEM_guardedalloc.h includes broke building with SSE enabled. - all C/C++ files in blender are now utf8 compatible. --- source/blender/blenkernel/intern/fluidsim.c | 1 - source/blender/makesrna/intern/rna_modifier.c | 1 - source/blender/makesrna/intern/rna_vfont.c | 2 +- source/blender/render/intern/raytrace/rayobject_qbvh.cpp | 1 + source/blender/render/intern/raytrace/rayobject_svbvh.cpp | 2 ++ 5 files changed, 4 insertions(+), 3 deletions(-) (limited to 'source/blender') diff --git a/source/blender/blenkernel/intern/fluidsim.c b/source/blender/blenkernel/intern/fluidsim.c index 8a6f0af87d1..04ce6c39694 100644 --- a/source/blender/blenkernel/intern/fluidsim.c +++ b/source/blender/blenkernel/intern/fluidsim.c @@ -50,7 +50,6 @@ #include "BKE_global.h" #include "BKE_modifier.h" #include "BKE_mesh.h" -#include "BKE_pointcache.h" #include "BKE_utildefines.h" // headers for fluidsim bobj meshes diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index 17cd2e5ef6b..484a7fb5608 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -97,7 +97,6 @@ EnumPropertyItem modifier_type_items[] ={ #include "BKE_library.h" #include "BKE_modifier.h" #include "BKE_particle.h" -#include "BKE_pointcache.h" static void rna_UVProject_projectors_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) { diff --git a/source/blender/makesrna/intern/rna_vfont.c b/source/blender/makesrna/intern/rna_vfont.c index c19fbd7d5d3..41387e806b9 100644 --- a/source/blender/makesrna/intern/rna_vfont.c +++ b/source/blender/makesrna/intern/rna_vfont.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * Contributor(s): Blender Foundation (2008), Juho Vepsäläinen + * Contributor(s): Blender Foundation (2008), Juho Vepsäläinen * * ***** END GPL LICENSE BLOCK ***** */ diff --git a/source/blender/render/intern/raytrace/rayobject_qbvh.cpp b/source/blender/render/intern/raytrace/rayobject_qbvh.cpp index afffdd44f1f..c510af540db 100644 --- a/source/blender/render/intern/raytrace/rayobject_qbvh.cpp +++ b/source/blender/render/intern/raytrace/rayobject_qbvh.cpp @@ -26,6 +26,7 @@ * * ***** END GPL LICENSE BLOCK ***** */ +#include "MEM_guardedalloc.h" #include "vbvh.h" #include "svbvh.h" #include "reorganize.h" diff --git a/source/blender/render/intern/raytrace/rayobject_svbvh.cpp b/source/blender/render/intern/raytrace/rayobject_svbvh.cpp index 389512ce469..647c5771e4f 100644 --- a/source/blender/render/intern/raytrace/rayobject_svbvh.cpp +++ b/source/blender/render/intern/raytrace/rayobject_svbvh.cpp @@ -26,6 +26,8 @@ * * ***** END GPL LICENSE BLOCK ***** */ +#include "MEM_guardedalloc.h" + #include "vbvh.h" #include "svbvh.h" #include "reorganize.h" -- cgit v1.2.3