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:
authorCampbell Barton <ideasman42@gmail.com>2021-03-12 07:58:12 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-03-12 08:13:36 +0300
commita5c44265a3368020bc9524696dae94caa9419e2c (patch)
tree6c3143de333163ba75f277d685ac87933e7baf2d /source/blender/python/intern/bpy_library_load.c
parent2a5f22c1afc9d143f3e1c784a0139e0d990d5a4a (diff)
Cleanup: remove workaround for MSVC PyTypeObject declarations
This is no longer needed for MSVC-2017.
Diffstat (limited to 'source/blender/python/intern/bpy_library_load.c')
-rw-r--r--source/blender/python/intern/bpy_library_load.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/source/blender/python/intern/bpy_library_load.c b/source/blender/python/intern/bpy_library_load.c
index 1ee14df24cf..96ff6a111d9 100644
--- a/source/blender/python/intern/bpy_library_load.c
+++ b/source/blender/python/intern/bpy_library_load.c
@@ -118,8 +118,8 @@ static PyTypeObject bpy_lib_Type = {
NULL, /* reprfunc tp_str; */
/* will only use these if this is a subtype of a py class */
- NULL /*PyObject_GenericGetAttr is assigned later */, /* getattrofunc tp_getattro; */
- NULL, /* setattrofunc tp_setattro; */
+ PyObject_GenericGetAttr, /* getattrofunc tp_getattro; */
+ NULL, /* setattrofunc tp_setattro; */
/* Functions to access object as input/output buffer */
NULL, /* PyBufferProcs *tp_as_buffer; */
@@ -498,10 +498,6 @@ PyMethodDef BPY_library_load_method_def = {
int BPY_library_load_type_ready(void)
{
-
- /* some compilers don't like accessing this directly, delay assignment */
- bpy_lib_Type.tp_getattro = PyObject_GenericGetAttr;
-
if (PyType_Ready(&bpy_lib_Type) < 0) {
return -1;
}