Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2013-05-28 23:35:26 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-05-28 23:35:26 +0400
commit225c5fee6b046b9829643f82cf6cbce159e4e007 (patch)
tree4092b2c57ba33a616dd0a837b050d0c79f9bcc84 /source/blender/gpu
parent60befcdc6297281ce226273123d3ccfc0a681aff (diff)
move BLO_sys_types.h -> BLI_sys_types.h (it had nothing todo with loading)
remove MEM_sys_types.h which was a duplicate.
Diffstat (limited to 'source/blender/gpu')
-rw-r--r--source/blender/gpu/CMakeLists.txt1
-rw-r--r--source/blender/gpu/SConscript1
-rw-r--r--source/blender/gpu/intern/gpu_codegen.c2
3 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt
index 485f5d65853..93c80c68f24 100644
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -27,7 +27,6 @@ set(INC
.
../blenkernel
../blenlib
- ../blenloader
../bmesh
../imbuf
../makesdna
diff --git a/source/blender/gpu/SConscript b/source/blender/gpu/SConscript
index be3d3f5a927..c1c3fa92cb1 100644
--- a/source/blender/gpu/SConscript
+++ b/source/blender/gpu/SConscript
@@ -39,7 +39,6 @@ incs = [
'#/extern/glew/include',
'../blenkernel',
'../blenlib',
- '../blenloader',
'../bmesh',
'../imbuf',
'../include',
diff --git a/source/blender/gpu/intern/gpu_codegen.c b/source/blender/gpu/intern/gpu_codegen.c
index 3b678624eea..39cae4f01ce 100644
--- a/source/blender/gpu/intern/gpu_codegen.c
+++ b/source/blender/gpu/intern/gpu_codegen.c
@@ -47,7 +47,7 @@
#include "GPU_material.h"
#include "GPU_extensions.h"
-#include "BLO_sys_types.h" // for intptr_t support
+#include "BLI_sys_types.h" // for intptr_t support
#include "gpu_codegen.h"