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/render
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/render')
-rw-r--r--source/blender/render/CMakeLists.txt1
-rw-r--r--source/blender/render/SConscript1
-rw-r--r--source/blender/render/intern/include/render_types.h2
3 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt
index 4f1d0d234fc..a907384e19e 100644
--- a/source/blender/render/CMakeLists.txt
+++ b/source/blender/render/CMakeLists.txt
@@ -30,7 +30,6 @@ set(INC
../blenfont
../blenkernel
../blenlib
- ../blenloader
../imbuf
../makesdna
../makesrna
diff --git a/source/blender/render/SConscript b/source/blender/render/SConscript
index 4303a51f983..ef5c5066426 100644
--- a/source/blender/render/SConscript
+++ b/source/blender/render/SConscript
@@ -37,7 +37,6 @@ incs = [
'../blenfont',
'../blenkernel',
'../blenlib',
- '../blenloader',
'../bmesh',
'../imbuf',
'../include',
diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h
index b7b0f18b853..42dc9bcdfb2 100644
--- a/source/blender/render/intern/include/render_types.h
+++ b/source/blender/render/intern/include/render_types.h
@@ -50,7 +50,7 @@
#include "RE_shader_ext.h" /* TexResult, ShadeResult, ShadeInput */
#include "sunsky.h"
-#include "BLO_sys_types.h" // for intptr_t support
+#include "BLI_sys_types.h" // for intptr_t support
struct Object;
struct MemArena;