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:
-rw-r--r--source/blender/python/generic/CMakeLists.txt4
-rw-r--r--source/blender/python/generic/blf_py_api.c (renamed from source/blender/python/generic/blf_api.c)2
-rw-r--r--source/blender/python/generic/blf_py_api.h (renamed from source/blender/python/generic/blf_api.h)0
-rw-r--r--source/blender/python/intern/bpy.c2
-rw-r--r--source/gameengine/Ketsji/KX_PythonInit.cpp2
5 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/python/generic/CMakeLists.txt b/source/blender/python/generic/CMakeLists.txt
index 5569dda2ce6..e8a7a7149db 100644
--- a/source/blender/python/generic/CMakeLists.txt
+++ b/source/blender/python/generic/CMakeLists.txt
@@ -31,7 +31,7 @@ set(INC
set(SRC
IDProp.c
bgl.c
- blf_api.c
+ blf_py_api.c
bpy_internal_import.c
mathutils.c
mathutils_color.c
@@ -45,7 +45,7 @@ set(SRC
IDProp.h
bgl.h
- blf_api.h
+ blf_py_api.h
bpy_internal_import.h
mathutils.h
mathutils_color.h
diff --git a/source/blender/python/generic/blf_api.c b/source/blender/python/generic/blf_py_api.c
index e81b885f7bb..8821aa6d6e7 100644
--- a/source/blender/python/generic/blf_api.c
+++ b/source/blender/python/generic/blf_py_api.c
@@ -23,7 +23,7 @@
*/
#include <Python.h>
-#include "blf_api.h"
+#include "blf_py_api.h"
#include "../../blenfont/BLF_api.h"
#include "BKE_utildefines.h"
diff --git a/source/blender/python/generic/blf_api.h b/source/blender/python/generic/blf_py_api.h
index db17f62337b..db17f62337b 100644
--- a/source/blender/python/generic/blf_api.h
+++ b/source/blender/python/generic/blf_py_api.h
diff --git a/source/blender/python/intern/bpy.c b/source/blender/python/intern/bpy.c
index 2b6fbd7aaa5..834d472d786 100644
--- a/source/blender/python/intern/bpy.c
+++ b/source/blender/python/intern/bpy.c
@@ -44,7 +44,7 @@
/* external util modules */
#include "../generic/mathutils.h"
#include "../generic/bgl.h"
-#include "../generic/blf_api.h"
+#include "../generic/blf_py_api.h"
#include "../generic/IDProp.h"
#include "AUD_PyInit.h"
diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp
index 99870c42018..48e002fc3c2 100644
--- a/source/gameengine/Ketsji/KX_PythonInit.cpp
+++ b/source/gameengine/Ketsji/KX_PythonInit.cpp
@@ -51,7 +51,7 @@ extern "C" {
#include "py_capi_utils.h"
#include "mathutils.h" // Blender.Mathutils module copied here so the blenderlayer can use.
#include "bgl.h"
- #include "blf_api.h"
+ #include "blf_py_api.h"
#include "marshal.h" /* python header for loading/saving dicts */
}