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:
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r--source/blender/makesrna/RNA_types.h2
-rw-r--r--source/blender/makesrna/SConscript1
-rw-r--r--source/blender/makesrna/intern/CMakeLists.txt1
-rw-r--r--source/blender/makesrna/intern/SConscript1
-rw-r--r--source/blender/makesrna/intern/rna_mesh_api.c2
-rw-r--r--source/blender/makesrna/intern/rna_meta_api.c2
-rw-r--r--source/blender/makesrna/intern/rna_object.c2
-rw-r--r--source/blender/makesrna/intern/rna_pose_api.c2
8 files changed, 5 insertions, 8 deletions
diff --git a/source/blender/makesrna/RNA_types.h b/source/blender/makesrna/RNA_types.h
index db0d122df8d..69cb2caf058 100644
--- a/source/blender/makesrna/RNA_types.h
+++ b/source/blender/makesrna/RNA_types.h
@@ -25,7 +25,7 @@
*/
-#include "BLO_sys_types.h"
+#include "../blenlib/BLI_sys_types.h"
#ifndef __RNA_TYPES_H__
#define __RNA_TYPES_H__
diff --git a/source/blender/makesrna/SConscript b/source/blender/makesrna/SConscript
index 9410bced37b..3b322491559 100644
--- a/source/blender/makesrna/SConscript
+++ b/source/blender/makesrna/SConscript
@@ -44,7 +44,6 @@ incs = [
'../blenfont',
'../blenkernel',
'../blenlib',
- '../blenloader',
'../bmesh',
'../editors/include',
'../gpu',
diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt
index 2e0eacf90e5..11a4dcfab8a 100644
--- a/source/blender/makesrna/intern/CMakeLists.txt
+++ b/source/blender/makesrna/intern/CMakeLists.txt
@@ -257,7 +257,6 @@ blender_include_dirs(
.
..
../../blenkernel
- ../../blenloader
../../blenlib
../../bmesh
../../blenfont
diff --git a/source/blender/makesrna/intern/SConscript b/source/blender/makesrna/intern/SConscript
index 316c3fde5d5..49528db0022 100644
--- a/source/blender/makesrna/intern/SConscript
+++ b/source/blender/makesrna/intern/SConscript
@@ -66,7 +66,6 @@ incs = [
'../../blenfont',
'../../blenkernel',
'../../blenlib',
- '../../blenloader',
'../../bmesh',
'../../editors/include',
'../../ikplugin',
diff --git a/source/blender/makesrna/intern/rna_mesh_api.c b/source/blender/makesrna/intern/rna_mesh_api.c
index 3b0936a3830..696ee8cbfa0 100644
--- a/source/blender/makesrna/intern/rna_mesh_api.c
+++ b/source/blender/makesrna/intern/rna_mesh_api.c
@@ -34,7 +34,7 @@
#include "RNA_define.h"
-#include "BLO_sys_types.h"
+#include "BLI_sys_types.h"
#include "BLI_utildefines.h"
diff --git a/source/blender/makesrna/intern/rna_meta_api.c b/source/blender/makesrna/intern/rna_meta_api.c
index 500e202b16f..abf3de02aa0 100644
--- a/source/blender/makesrna/intern/rna_meta_api.c
+++ b/source/blender/makesrna/intern/rna_meta_api.c
@@ -34,7 +34,7 @@
#include "RNA_define.h"
-#include "BLO_sys_types.h"
+#include "BLI_sys_types.h"
#include "BLI_utildefines.h"
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index c6ce185d9f3..eab13ae4165 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -51,7 +51,7 @@
#include "rna_internal.h"
-#include "BLO_sys_types.h" /* needed for intptr_t used in ED_mesh.h */
+#include "BLI_sys_types.h" /* needed for intptr_t used in ED_mesh.h */
#include "ED_mesh.h"
#include "WM_api.h"
diff --git a/source/blender/makesrna/intern/rna_pose_api.c b/source/blender/makesrna/intern/rna_pose_api.c
index 29d7c616d25..465a86adc31 100644
--- a/source/blender/makesrna/intern/rna_pose_api.c
+++ b/source/blender/makesrna/intern/rna_pose_api.c
@@ -40,7 +40,7 @@
#include "DNA_object_types.h"
-/* #include "BLO_sys_types.h" */
+/* #include "BLI_sys_types.h" */
#include "rna_internal.h" /* own include */