From 8f21a43535cb200c0569566a1b012aec883aa53c Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Fri, 7 Jan 2011 18:36:47 +0000
Subject: split BKE_utildefines.h, now it only has blender specific defines
 like GS() MAKE_ID, FILE_MAXDIR, moved the generic defines to
 BLI_utildefines.h. no functional changes.

---
 source/blender/render/intern/raytrace/bvh.h                 | 2 ++
 source/blender/render/intern/raytrace/rayobject.cpp         | 6 +++++-
 source/blender/render/intern/raytrace/rayobject_rtbuild.cpp | 3 +++
 source/blender/render/intern/raytrace/reorganize.h          | 2 ++
 source/blender/render/intern/raytrace/svbvh.h               | 1 +
 source/blender/render/intern/raytrace/vbvh.h                | 2 +-
 6 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'source/blender/render/intern/raytrace')

diff --git a/source/blender/render/intern/raytrace/bvh.h b/source/blender/render/intern/raytrace/bvh.h
index 133a3d4a005..c31d1213b99 100644
--- a/source/blender/render/intern/raytrace/bvh.h
+++ b/source/blender/render/intern/raytrace/bvh.h
@@ -31,6 +31,8 @@
 #include "rayobject_rtbuild.h"
 #include "rayobject_hint.h"
 
+#include "BLI_utildefines.h"
+
 #include <assert.h>
 
 #ifdef __SSE__
diff --git a/source/blender/render/intern/raytrace/rayobject.cpp b/source/blender/render/intern/raytrace/rayobject.cpp
index 6a7066eeb9b..4ca55f3dce7 100644
--- a/source/blender/render/intern/raytrace/rayobject.cpp
+++ b/source/blender/render/intern/raytrace/rayobject.cpp
@@ -28,11 +28,15 @@
  */
 #include <assert.h>
 
-#include "BKE_utildefines.h"
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
+
+#include "BKE_utildefines.h"
+
 #include "DNA_material_types.h"
 
 #include "RE_raytrace.h"
+
 #include "render_types.h"
 #include "rayobject.h"
 #include "raycounter.h"
diff --git a/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp b/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
index 1c3cdd5919f..7d589c46d1f 100644
--- a/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
+++ b/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
@@ -33,7 +33,10 @@
 
 #include "rayobject_rtbuild.h"
 #include "MEM_guardedalloc.h"
+
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
+
 #include "BKE_utildefines.h"
 
 static bool selected_node(RTBuilder::Object *node)
diff --git a/source/blender/render/intern/raytrace/reorganize.h b/source/blender/render/intern/raytrace/reorganize.h
index 1d923c92d6f..c8fbd1cfe94 100644
--- a/source/blender/render/intern/raytrace/reorganize.h
+++ b/source/blender/render/intern/raytrace/reorganize.h
@@ -32,6 +32,8 @@
 #include <vector>
 #include <queue>
 
+#include "BLI_utildefines.h"
+
 #include "BKE_global.h"
 
 #ifdef _WIN32
diff --git a/source/blender/render/intern/raytrace/svbvh.h b/source/blender/render/intern/raytrace/svbvh.h
index 055a71e3380..11511fccb89 100644
--- a/source/blender/render/intern/raytrace/svbvh.h
+++ b/source/blender/render/intern/raytrace/svbvh.h
@@ -33,6 +33,7 @@
 
 #include "bvh.h"
 #include "BLI_memarena.h"
+#include "BLI_utildefines.h"
 #include "BKE_global.h"
 #include <stdio.h>
 #include <algorithm>
diff --git a/source/blender/render/intern/raytrace/vbvh.h b/source/blender/render/intern/raytrace/vbvh.h
index 21c3c0b4c01..a5ca093de2a 100644
--- a/source/blender/render/intern/raytrace/vbvh.h
+++ b/source/blender/render/intern/raytrace/vbvh.h
@@ -31,7 +31,7 @@
 #include <algorithm>
 #include "rayobject_rtbuild.h"
 #include "BLI_memarena.h"
-
+#include "BLI_utildefines.h"
 
 /*
  * VBVHNode represents a BVHNode with support for a variable number of childrens
-- 
cgit v1.2.3