diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-01-07 21:36:47 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-01-07 21:36:47 +0300 |
commit | 8f21a43535cb200c0569566a1b012aec883aa53c (patch) | |
tree | e41eeff28b248000af473053c59990eb3497bf3a /source/blender/gpu | |
parent | a601fd889331c319803daa7505c2c8016f15a47f (diff) |
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.
Diffstat (limited to 'source/blender/gpu')
-rw-r--r-- | source/blender/gpu/intern/gpu_buffers.c | 3 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_codegen.c | 4 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_draw.c | 1 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_extensions.c | 2 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_material.c | 7 |
5 files changed, 10 insertions, 7 deletions
diff --git a/source/blender/gpu/intern/gpu_buffers.c b/source/blender/gpu/intern/gpu_buffers.c index 00644eb02f7..ac7598a642f 100644 --- a/source/blender/gpu/intern/gpu_buffers.c +++ b/source/blender/gpu/intern/gpu_buffers.c @@ -38,8 +38,9 @@ #include "MEM_guardedalloc.h" -#include "BLI_ghash.h" #include "BLI_math.h" +#include "BLI_utildefines.h" +#include "BLI_ghash.h" #include "BLI_threads.h" #include "DNA_meshdata_types.h" diff --git a/source/blender/gpu/intern/gpu_codegen.c b/source/blender/gpu/intern/gpu_codegen.c index 62a7d399377..9f0bbda91bb 100644 --- a/source/blender/gpu/intern/gpu_codegen.c +++ b/source/blender/gpu/intern/gpu_codegen.c @@ -38,12 +38,12 @@ #include "DNA_image_types.h" #include "DNA_material_types.h" -#include "BLI_dynstr.h" #include "BLI_blenlib.h" +#include "BLI_utildefines.h" +#include "BLI_dynstr.h" #include "BLI_ghash.h" #include "BLI_heap.h" - #include "GPU_material.h" #include "GPU_extensions.h" diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c index 5763cd958d0..72c20711863 100644 --- a/source/blender/gpu/intern/gpu_draw.c +++ b/source/blender/gpu/intern/gpu_draw.c @@ -35,6 +35,7 @@ #include "GL/glew.h" #include "BLI_math.h" +#include "BLI_utildefines.h" #include "DNA_lamp_types.h" #include "DNA_material_types.h" diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.c index 82a8ac8a62a..61188b9ca0f 100644 --- a/source/blender/gpu/intern/gpu_extensions.c +++ b/source/blender/gpu/intern/gpu_extensions.c @@ -39,8 +39,8 @@ #include "BKE_global.h" #include "BKE_utildefines.h" - #include "BLI_blenlib.h" +#include "BLI_utildefines.h" #include "GPU_draw.h" #include "GPU_extensions.h" diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c index b9da22b36a7..33bde8651b1 100644 --- a/source/blender/gpu/intern/gpu_material.c +++ b/source/blender/gpu/intern/gpu_material.c @@ -40,6 +40,10 @@ #include "DNA_scene_types.h" #include "DNA_world_types.h" +#include "BLI_math.h" +#include "BLI_blenlib.h" +#include "BLI_utildefines.h" + #include "BKE_anim.h" #include "BKE_colortools.h" #include "BKE_DerivedMesh.h" @@ -50,9 +54,6 @@ #include "BKE_texture.h" #include "BKE_utildefines.h" -#include "BLI_math.h" -#include "BLI_blenlib.h" - #include "GPU_extensions.h" #include "GPU_material.h" |