diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-01-07 22:18:31 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-01-07 22:18:31 +0300 |
commit | 89c9aaaa25cc7ce60c305d8e30e1c008cb117cf1 (patch) | |
tree | ac9e9fc1a682129df4af48a3b9a2fb59e3e85fcf /source/blender/blenlib | |
parent | 8f21a43535cb200c0569566a1b012aec883aa53c (diff) |
remove references to BKE_utildefines where its not needed.
- move GS() define into DNA_ID.h
- add BLI_utildefines as an automatic include with makesrna generated files.
Diffstat (limited to 'source/blender/blenlib')
-rw-r--r-- | source/blender/blenlib/intern/BLI_kdopbvh.c | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/freetypefont.c | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/graph.c | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/math_geom.c | 4 | ||||
-rw-r--r-- | source/blender/blenlib/intern/storage.c | 1 | ||||
-rw-r--r-- | source/blender/blenlib/intern/voxel.c | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/winstuff.c | 2 |
7 files changed, 8 insertions, 7 deletions
diff --git a/source/blender/blenlib/intern/BLI_kdopbvh.c b/source/blender/blenlib/intern/BLI_kdopbvh.c index 85520c95829..4673462f58b 100644 --- a/source/blender/blenlib/intern/BLI_kdopbvh.c +++ b/source/blender/blenlib/intern/BLI_kdopbvh.c @@ -32,7 +32,7 @@ #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + #include "BLI_kdopbvh.h" #include "BLI_math.h" diff --git a/source/blender/blenlib/intern/freetypefont.c b/source/blender/blenlib/intern/freetypefont.c index 94cd162a961..f63302e3cee 100644 --- a/source/blender/blenlib/intern/freetypefont.c +++ b/source/blender/blenlib/intern/freetypefont.c @@ -52,7 +52,7 @@ //XXX #include "BIF_toolbox.h" #include "BKE_font.h" -#include "BKE_utildefines.h" + #include "DNA_vfont_types.h" #include "DNA_packedFile_types.h" diff --git a/source/blender/blenlib/intern/graph.c b/source/blender/blenlib/intern/graph.c index 95beca0e97b..a96b2d20976 100644 --- a/source/blender/blenlib/intern/graph.c +++ b/source/blender/blenlib/intern/graph.c @@ -33,7 +33,7 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + static void testRadialSymmetry(BGraph *graph, BNode* root_node, RadialArc* ring, int total, float axis[3], float limit, int group); diff --git a/source/blender/blenlib/intern/math_geom.c b/source/blender/blenlib/intern/math_geom.c index 98ba9b0b41f..fb90af873df 100644 --- a/source/blender/blenlib/intern/math_geom.c +++ b/source/blender/blenlib/intern/math_geom.c @@ -32,7 +32,7 @@ #include "BLI_memarena.h" #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + /********************************** Polygons *********************************/ @@ -630,7 +630,7 @@ static int getLowestRoot(float a, float b, float c, float maxR, float* root) if (determinant >= 0.0f) { // calculate the two roots: (if determinant == 0 then - // x1==x2 but let’s disregard that slight optimization) + // x1==x2 but lets disregard that slight optimization) float sqrtD = (float)sqrt(determinant); float r1 = (-b - sqrtD) / (2.0f*a); float r2 = (-b + sqrtD) / (2.0f*a); diff --git a/source/blender/blenlib/intern/storage.c b/source/blender/blenlib/intern/storage.c index 53d9f2b78e7..6da59fd4e81 100644 --- a/source/blender/blenlib/intern/storage.c +++ b/source/blender/blenlib/intern/storage.c @@ -91,6 +91,7 @@ #include "BLI_linklist.h" #include "BLI_storage_types.h" #include "BLI_string.h" + #include "BKE_utildefines.h" /* vars: */ diff --git a/source/blender/blenlib/intern/voxel.c b/source/blender/blenlib/intern/voxel.c index 64f7d7904b1..72a9c7d98ec 100644 --- a/source/blender/blenlib/intern/voxel.c +++ b/source/blender/blenlib/intern/voxel.c @@ -29,7 +29,7 @@ #include "BLI_voxel.h" #include "BLI_utildefines.h" -#include "BKE_utildefines.h" + BM_INLINE float D(float *data, int *res, int x, int y, int z) { diff --git a/source/blender/blenlib/intern/winstuff.c b/source/blender/blenlib/intern/winstuff.c index b3438590321..6f38dceccba 100644 --- a/source/blender/blenlib/intern/winstuff.c +++ b/source/blender/blenlib/intern/winstuff.c @@ -39,7 +39,7 @@ #define WIN32_SKIP_HKEY_PROTECTION // need to use HKEY #include "BLI_winstuff.h" -#include "BKE_utildefines.h" /* FILE_MAXDIR + FILE_MAXFILE */ + /* FILE_MAXDIR + FILE_MAXFILE */ int BLI_getInstallationDir( char * str ) { char dir[FILE_MAXDIR]; |