diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 09:05:38 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 09:05:38 +0300 |
commit | 9bd0c63382bf226c271c40d5a5967c22c75718ea (patch) | |
tree | 97ad1061c10f39498459d54da34caddd59d39fbd /source/blender/python | |
parent | be983295ea14af226b3c824a035ccee9d416c67f (diff) | |
parent | af36dd4664ddf35c7ad99f05f9878ce1acf787bd (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/python')
-rw-r--r-- | source/blender/python/bmesh/bmesh_py_types_meshdata.c | 1 | ||||
-rw-r--r-- | source/blender/python/generic/python_utildefines.h | 1 | ||||
-rw-r--r-- | source/blender/python/intern/bpy_app_alembic.h | 1 | ||||
-rw-r--r-- | source/blender/python/intern/bpy_app_openvdb.h | 1 | ||||
-rw-r--r-- | source/blender/python/intern/bpy_app_translations.c | 1 | ||||
-rw-r--r-- | source/blender/python/intern/bpy_manipulator_wrap.c | 1 | ||||
-rw-r--r-- | source/blender/python/intern/bpy_manipulator_wrap.h | 1 | ||||
-rw-r--r-- | source/blender/python/intern/bpy_msgbus.c | 1 | ||||
-rw-r--r-- | source/blender/python/intern/bpy_operator_wrap.c | 1 | ||||
-rw-r--r-- | source/blender/python/intern/bpy_path.c | 1 | ||||
-rw-r--r-- | source/blender/python/intern/gpu.c | 1 | ||||
-rw-r--r-- | source/blender/python/simple_enum_gen.py | 4 |
12 files changed, 0 insertions, 15 deletions
diff --git a/source/blender/python/bmesh/bmesh_py_types_meshdata.c b/source/blender/python/bmesh/bmesh_py_types_meshdata.c index bc96ce606a9..4e55495a0cd 100644 --- a/source/blender/python/bmesh/bmesh_py_types_meshdata.c +++ b/source/blender/python/bmesh/bmesh_py_types_meshdata.c @@ -713,4 +713,3 @@ void BPy_BM_init_types_meshdata(void) bm_init_types_bmdvert(); bm_init_types_bmvertskin(); } - diff --git a/source/blender/python/generic/python_utildefines.h b/source/blender/python/generic/python_utildefines.h index 2d2d19c05f5..83880d82973 100644 --- a/source/blender/python/generic/python_utildefines.h +++ b/source/blender/python/generic/python_utildefines.h @@ -57,4 +57,3 @@ Py_LOCAL_INLINE(int) PyList_APPEND(PyObject *op, PyObject *v) #endif #endif /* __PYTHON_UTILDEFINES_H__ */ - diff --git a/source/blender/python/intern/bpy_app_alembic.h b/source/blender/python/intern/bpy_app_alembic.h index 8cc647a77df..773bb2fd3bf 100644 --- a/source/blender/python/intern/bpy_app_alembic.h +++ b/source/blender/python/intern/bpy_app_alembic.h @@ -35,4 +35,3 @@ PyObject *BPY_app_alembic_struct(void); #endif /* __BPY_APP_ALEMBIC_H__ */ - diff --git a/source/blender/python/intern/bpy_app_openvdb.h b/source/blender/python/intern/bpy_app_openvdb.h index 12fa54ea7a3..ef712982695 100644 --- a/source/blender/python/intern/bpy_app_openvdb.h +++ b/source/blender/python/intern/bpy_app_openvdb.h @@ -35,4 +35,3 @@ PyObject *BPY_app_openvdb_struct(void); #endif /* __BPY_APP_OPENVDB_H__ */ - diff --git a/source/blender/python/intern/bpy_app_translations.c b/source/blender/python/intern/bpy_app_translations.c index 6ba858f0228..ffc54969d8c 100644 --- a/source/blender/python/intern/bpy_app_translations.c +++ b/source/blender/python/intern/bpy_app_translations.c @@ -824,4 +824,3 @@ void BPY_app_translations_end(void) _clear_translations_cache(); #endif } - diff --git a/source/blender/python/intern/bpy_manipulator_wrap.c b/source/blender/python/intern/bpy_manipulator_wrap.c index 9df4e81ec55..3703ea92fa7 100644 --- a/source/blender/python/intern/bpy_manipulator_wrap.c +++ b/source/blender/python/intern/bpy_manipulator_wrap.c @@ -233,4 +233,3 @@ void BPY_RNA_manipulatorgroup_wrapper(wmManipulatorGroupType *wgt, void *userdat } /** \} */ - diff --git a/source/blender/python/intern/bpy_manipulator_wrap.h b/source/blender/python/intern/bpy_manipulator_wrap.h index 3f739e26059..3e415350228 100644 --- a/source/blender/python/intern/bpy_manipulator_wrap.h +++ b/source/blender/python/intern/bpy_manipulator_wrap.h @@ -33,4 +33,3 @@ void BPY_RNA_manipulator_wrapper(struct wmManipulatorType *wt, void *userdata); void BPY_RNA_manipulatorgroup_wrapper(struct wmManipulatorGroupType *wgt, void *userdata); #endif /* __BPY_MANIPULATOR_WRAP_H__ */ - diff --git a/source/blender/python/intern/bpy_msgbus.c b/source/blender/python/intern/bpy_msgbus.c index 941d6b760dc..b76ecafe6f0 100644 --- a/source/blender/python/intern/bpy_msgbus.c +++ b/source/blender/python/intern/bpy_msgbus.c @@ -397,4 +397,3 @@ PyObject *BPY_msgbus_module(void) } /** \} */ - diff --git a/source/blender/python/intern/bpy_operator_wrap.c b/source/blender/python/intern/bpy_operator_wrap.c index 9d57adca946..ae84d83b431 100644 --- a/source/blender/python/intern/bpy_operator_wrap.c +++ b/source/blender/python/intern/bpy_operator_wrap.c @@ -200,4 +200,3 @@ PyObject *PYOP_wrap_macro_define(PyObject *UNUSED(self), PyObject *args) return pyrna_struct_CreatePyObject(&ptr_otmacro); } - diff --git a/source/blender/python/intern/bpy_path.c b/source/blender/python/intern/bpy_path.c index 1d554b60bbe..f182972ba9c 100644 --- a/source/blender/python/intern/bpy_path.c +++ b/source/blender/python/intern/bpy_path.c @@ -64,4 +64,3 @@ PyObject *BPyInit__bpy_path(void) return submodule; } - diff --git a/source/blender/python/intern/gpu.c b/source/blender/python/intern/gpu.c index e77470c070e..a3de9a3a7fd 100644 --- a/source/blender/python/intern/gpu.c +++ b/source/blender/python/intern/gpu.c @@ -105,4 +105,3 @@ PyObject *GPU_initPython(void) PyDict_SetItem(PyImport_GetModuleDict(), PyModule_GetNameObject(module), module); return module; } - diff --git a/source/blender/python/simple_enum_gen.py b/source/blender/python/simple_enum_gen.py index eef19b6c5f1..95052ccae0c 100644 --- a/source/blender/python/simple_enum_gen.py +++ b/source/blender/python/simple_enum_gen.py @@ -59,7 +59,3 @@ for d in defs.split('\n'): py_val = w[0] print '\tPyModule_AddObject(mod, "%s", PyLong_FromSize_t(%s));' % (val, py_val) - - - - |