diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-11-29 13:30:03 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-11-29 13:32:16 +0300 |
commit | 28048f75ce42b370c76cc62a6b8b5de14586fcd6 (patch) | |
tree | 0a7d2aa0735e3b2c2c65a205e4663db16547eafc /source/blender | |
parent | 69d33ecdec0d131ede1ed488fc1cf16689c07284 (diff) | |
parent | e32cfb0743d9b4da08403f9fd33abd1cadbd0299 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender')
16 files changed, 25 insertions, 25 deletions
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 26fbc5d9eb2..36aa310fe10 100644 --- a/source/blender/python/intern/CMakeLists.txt +++ b/source/blender/python/intern/CMakeLists.txt @@ -45,10 +45,6 @@ set(INC_SYS ) set(SRC - gpu.c - gpu_offscreen.c - gpu_py_matrix.c - gpu_py_select.c bpy.c bpy_app.c bpy_app_alembic.c @@ -61,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 @@ -80,12 +77,14 @@ set(SRC bpy_rna_id_collection.c bpy_rna_manipulator.c bpy_traceback.c - bpy_util.c bpy_utils_previews.c bpy_utils_units.c + gpu.c + gpu_offscreen.c + gpu_py_matrix.c + gpu_py_select.c stubs.c - gpu.h bpy.h bpy_app.h bpy_app_alembic.h @@ -98,6 +97,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 @@ -113,9 +113,9 @@ set(SRC bpy_rna_id_collection.h bpy_rna_manipulator.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 c576786a54c..edb4b3ec0ec 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 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 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 7ddb41c3b0d..11a233461d8 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 1b1d6294db6..4cd5e21bc22 100644 --- a/source/blender/python/intern/bpy_library_load.c +++ b/source/blender/python/intern/bpy_library_load.c @@ -48,7 +48,7 @@ #include "BLO_readfile.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_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 9630beb6e8b..fdad3a7d919 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" diff --git a/source/blender/python/intern/bpy_rna_manipulator.c b/source/blender/python/intern/bpy_rna_manipulator.c index 4a326ae657b..950f7f98be0 100644 --- a/source/blender/python/intern/bpy_rna_manipulator.c +++ b/source/blender/python/intern/bpy_rna_manipulator.c @@ -37,7 +37,7 @@ #include "WM_api.h" #include "WM_types.h" -#include "bpy_util.h" +#include "bpy_capi_utils.h" #include "bpy_rna_manipulator.h" #include "../generic/py_capi_utils.h" |