[Bf-blender-cvs] [e32cfb0743d] master: Cleanup: rename bpy_util -> bpy_capi_utils
Campbell Barton
noreply at git.blender.org
Wed Nov 29 10:59:29 CET 2017
Commit: e32cfb0743d9b4da08403f9fd33abd1cadbd0299
Author: Campbell Barton
Date: Wed Nov 29 21:11:29 2017 +1100
Branches: master
https://developer.blender.org/rBe32cfb0743d9b4da08403f9fd33abd1cadbd0299
Cleanup: rename bpy_util -> bpy_capi_utils
This is for internal CAPI use only, avoid confusion w/ bpy.utils module.
===================================================================
M source/blender/freestyle/intern/system/PythonInterpreter.h
M source/blender/python/intern/CMakeLists.txt
M source/blender/python/intern/bpy.c
R094 source/blender/python/intern/bpy_util.c source/blender/python/intern/bpy_capi_utils.c
R097 source/blender/python/intern/bpy_util.h source/blender/python/intern/bpy_capi_utils.h
M source/blender/python/intern/bpy_interface.c
M source/blender/python/intern/bpy_interface_atexit.c
M source/blender/python/intern/bpy_library_load.c
M source/blender/python/intern/bpy_library_write.c
M source/blender/python/intern/bpy_operator.c
M source/blender/python/intern/bpy_props.c
M source/blender/python/intern/bpy_rna.c
M source/blender/python/intern/bpy_rna_anim.c
M source/blender/python/intern/bpy_rna_callback.c
M source/blender/python/intern/bpy_rna_id_collection.c
===================================================================
diff --git a/source/blender/freestyle/intern/system/PythonInterpreter.h b/source/blender/freestyle/intern/system/PythonInterpreter.h
index 0e08af1bac8..79ba9421cda 100644
--- a/source/blender/freestyle/intern/system/PythonInterpreter.h
+++ b/source/blender/freestyle/intern/system/PythonInterpreter.h
@@ -52,7 +52,7 @@ extern "C" {
#include "BPY_extern.h"
-#include "bpy_util.h"
+#include "bpy_capi_utils.h"
}
namespace Freestyle {
diff --git a/source/blender/python/intern/CMakeLists.txt b/source/blender/python/intern/CMakeLists.txt
index dd84ce0ebe1..cdbf65546d3 100644
--- a/source/blender/python/intern/CMakeLists.txt
+++ b/source/blender/python/intern/CMakeLists.txt
@@ -45,8 +45,6 @@ set(INC_SYS
)
set(SRC
- gpu.c
- gpu_offscreen.c
bpy.c
bpy_app.c
bpy_app_alembic.c
@@ -59,6 +57,7 @@ set(SRC
bpy_app_openvdb.c
bpy_app_sdl.c
bpy_app_translations.c
+ bpy_capi_utils.c
bpy_driver.c
bpy_interface.c
bpy_interface_atexit.c
@@ -76,12 +75,12 @@ set(SRC
bpy_rna_driver.c
bpy_rna_id_collection.c
bpy_traceback.c
- bpy_util.c
bpy_utils_previews.c
bpy_utils_units.c
+ gpu.c
+ gpu_offscreen.c
stubs.c
- gpu.h
bpy.h
bpy_app.h
bpy_app_alembic.h
@@ -94,6 +93,7 @@ set(SRC
bpy_app_openvdb.h
bpy_app_sdl.h
bpy_app_translations.h
+ bpy_capi_utils.h
bpy_driver.h
bpy_intern_string.h
bpy_library.h
@@ -107,9 +107,9 @@ set(SRC
bpy_rna_driver.h
bpy_rna_id_collection.h
bpy_traceback.h
- bpy_util.h
bpy_utils_previews.h
bpy_utils_units.h
+ gpu.h
../BPY_extern.h
)
diff --git a/source/blender/python/intern/bpy.c b/source/blender/python/intern/bpy.c
index 6e4a6148405..7150cc65942 100644
--- a/source/blender/python/intern/bpy.c
+++ b/source/blender/python/intern/bpy.c
@@ -42,7 +42,7 @@
#include "RNA_access.h"
#include "bpy.h"
-#include "bpy_util.h"
+#include "bpy_capi_utils.h"
#include "bpy_rna.h"
#include "bpy_app.h"
#include "bpy_rna_id_collection.h"
diff --git a/source/blender/python/intern/bpy_util.c b/source/blender/python/intern/bpy_capi_utils.c
similarity index 94%
rename from source/blender/python/intern/bpy_util.c
rename to source/blender/python/intern/bpy_capi_utils.c
index c15ff50df04..7232e4ea821 100644
--- a/source/blender/python/intern/bpy_util.c
+++ b/source/blender/python/intern/bpy_capi_utils.c
@@ -20,11 +20,11 @@
* ***** END GPL LICENSE BLOCK *****
*/
-/** \file blender/python/intern/bpy_util.c
+/** \file blender/python/intern/bpy_capi_utils.c
* \ingroup pythonintern
*
- * This file contains blender/python utility functions for the api's internal
- * use (unrelated to 'bpy.utils')
+ * This file contains Blender/Python utility functions to help implementing API's.
+ * This is not related to a particular module.
*/
#include <Python.h>
@@ -32,7 +32,7 @@
#include "BLI_utildefines.h"
#include "BLI_dynstr.h"
-#include "bpy_util.h"
+#include "bpy_capi_utils.h"
#include "MEM_guardedalloc.h"
diff --git a/source/blender/python/intern/bpy_util.h b/source/blender/python/intern/bpy_capi_utils.h
similarity index 97%
rename from source/blender/python/intern/bpy_util.h
rename to source/blender/python/intern/bpy_capi_utils.h
index 466941359a8..171c46d8e86 100644
--- a/source/blender/python/intern/bpy_util.h
+++ b/source/blender/python/intern/bpy_capi_utils.h
@@ -20,7 +20,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
-/** \file blender/python/intern/bpy_util.h
+/** \file blender/python/intern/bpy_capi_utils.h
* \ingroup pythonintern
*/
diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c
index 20cfd364a0c..ae8e35ae3fc 100644
--- a/source/blender/python/intern/bpy_interface.c
+++ b/source/blender/python/intern/bpy_interface.c
@@ -47,7 +47,7 @@
#include "gpu.h"
#include "bpy_rna.h"
#include "bpy_path.h"
-#include "bpy_util.h"
+#include "bpy_capi_utils.h"
#include "bpy_traceback.h"
#include "bpy_intern_string.h"
diff --git a/source/blender/python/intern/bpy_interface_atexit.c b/source/blender/python/intern/bpy_interface_atexit.c
index 5c4f6ba327c..3608a26d113 100644
--- a/source/blender/python/intern/bpy_interface_atexit.c
+++ b/source/blender/python/intern/bpy_interface_atexit.c
@@ -33,7 +33,7 @@
#include "BLI_utildefines.h"
-#include "bpy_util.h"
+#include "bpy_capi_utils.h"
#include "bpy.h" /* own include */
#include "WM_api.h"
diff --git a/source/blender/python/intern/bpy_library_load.c b/source/blender/python/intern/bpy_library_load.c
index 39fce293bd0..20226ffe6a3 100644
--- a/source/blender/python/intern/bpy_library_load.c
+++ b/source/blender/python/intern/bpy_library_load.c
@@ -48,7 +48,7 @@
#include "DNA_space_types.h" /* FILE_LINK, FILE_RELPATH */
-#include "bpy_util.h"
+#include "bpy_capi_utils.h"
#include "bpy_library.h"
#include "../generic/py_capi_utils.h"
diff --git a/source/blender/python/intern/bpy_library_write.c b/source/blender/python/intern/bpy_library_write.c
index c054183034a..9ca6092eab3 100644
--- a/source/blender/python/intern/bpy_library_write.c
+++ b/source/blender/python/intern/bpy_library_write.c
@@ -43,7 +43,7 @@
#include "RNA_types.h"
#include "bpy_rna.h"
-#include "bpy_util.h"
+#include "bpy_capi_utils.h"
#include "bpy_library.h"
#include "../generic/py_capi_utils.h"
diff --git a/source/blender/python/intern/bpy_operator.c b/source/blender/python/intern/bpy_operator.c
index c1fcb0792af..5b84a7cf73c 100644
--- a/source/blender/python/intern/bpy_operator.c
+++ b/source/blender/python/intern/bpy_operator.c
@@ -43,7 +43,7 @@
#include "bpy_operator.h"
#include "bpy_operator_wrap.h"
#include "bpy_rna.h" /* for setting arg props only - pyrna_py_to_prop() */
-#include "bpy_util.h"
+#include "bpy_capi_utils.h"
#include "../generic/bpy_internal_import.h"
#include "../generic/py_capi_utils.h"
#include "../generic/python_utildefines.h"
diff --git a/source/blender/python/intern/bpy_props.c b/source/blender/python/intern/bpy_props.c
index abeaeb27d88..d3eddff4b9a 100644
--- a/source/blender/python/intern/bpy_props.c
+++ b/source/blender/python/intern/bpy_props.c
@@ -37,7 +37,7 @@
#include "bpy_props.h"
#include "bpy_rna.h"
-#include "bpy_util.h"
+#include "bpy_capi_utils.h"
#include "BKE_idprop.h"
diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c
index d17117a4e37..1a9fd920af5 100644
--- a/source/blender/python/intern/bpy_rna.c
+++ b/source/blender/python/intern/bpy_rna.c
@@ -49,7 +49,7 @@
#include "bpy_rna.h"
#include "bpy_rna_anim.h"
#include "bpy_props.h"
-#include "bpy_util.h"
+#include "bpy_capi_utils.h"
#include "bpy_rna_callback.h"
#include "bpy_intern_string.h"
diff --git a/source/blender/python/intern/bpy_rna_anim.c b/source/blender/python/intern/bpy_rna_anim.c
index 8a0130babd5..9f9bb46c8bb 100644
--- a/source/blender/python/intern/bpy_rna_anim.c
+++ b/source/blender/python/intern/bpy_rna_anim.c
@@ -53,7 +53,7 @@
#include "WM_types.h"
#include "bpy_rna.h"
-#include "bpy_util.h"
+#include "bpy_capi_utils.h"
#include "bpy_rna_anim.h"
#include "../generic/python_utildefines.h"
diff --git a/source/blender/python/intern/bpy_rna_callback.c b/source/blender/python/intern/bpy_rna_callback.c
index fe3565fc44e..68783feacd9 100644
--- a/source/blender/python/intern/bpy_rna_callback.c
+++ b/source/blender/python/intern/bpy_rna_callback.c
@@ -36,7 +36,7 @@
#include "bpy_rna.h"
#include "bpy_rna_callback.h"
-#include "bpy_util.h"
+#include "bpy_capi_utils.h"
#include "DNA_space_types.h"
#include "DNA_screen_types.h"
diff --git a/source/blender/python/intern/bpy_rna_id_collection.c b/source/blender/python/intern/bpy_rna_id_collection.c
index 8def52dc8fb..ee40d30d73b 100644
--- a/source/blender/python/intern/bpy_rna_id_collection.c
+++ b/source/blender/python/intern/bpy_rna_id_collection.c
@@ -44,7 +44,7 @@
#include "DNA_object_types.h"
#include "DNA_key_types.h"
-#include "bpy_util.h"
+#include "bpy_capi_utils.h"
#include "bpy_rna_id_collection.h"
#include "../generic/py_capi_utils.h"
More information about the Bf-blender-cvs
mailing list