Merge branch 'master' into blender2.8

2 files changed, 6 insertions, 6 deletions

diff --git a/source/blender/python/intern/bpy_app.c b/source/blender/python/intern/bpy_app.c
index 03662102bbc..dde647793b0 100644
--- a/source/blender/python/intern/bpy_app.c
+++ b/source/blender/python/intern/bpy_app.c
@@ -240,13 +240,13 @@ PyDoc_STRVAR(bpy_app_debug_doc,
 );
 static PyObject *bpy_app_debug_get(PyObject *UNUSED(self), void *closure)
 {
-	const int flag = GET_INT_FROM_POINTER(closure);
+	const int flag = POINTER_AS_INT(closure);
 	return PyBool_FromLong(G.debug & flag);
 }
 
 static int bpy_app_debug_set(PyObject *UNUSED(self), PyObject *value, void *closure)
 {
-	const int flag = GET_INT_FROM_POINTER(closure);
+	const int flag = POINTER_AS_INT(closure);
 	const int param = PyObject_IsTrue(value);
 
 	if (param == -1) {
@@ -317,7 +317,7 @@ static int bpy_app_debug_value_set(PyObject *UNUSED(self), PyObject *value, void
 
 static PyObject *bpy_app_global_flag_get(PyObject *UNUSED(self), void *closure)
 {
-	const int flag = GET_INT_FROM_POINTER(closure);
+	const int flag = POINTER_AS_INT(closure);
 	return PyBool_FromLong(G.f & flag);
 }
 
@@ -349,7 +349,7 @@ PyDoc_STRVAR(bpy_app_preview_render_size_doc,
 );
 static PyObject *bpy_app_preview_render_size_get(PyObject *UNUSED(self), void *closure)
 {
-	return PyLong_FromLong((long)UI_preview_render_size(GET_INT_FROM_POINTER(closure)));
+	return PyLong_FromLong((long)UI_preview_render_size(POINTER_AS_INT(closure)));
 }
 
 static PyObject *bpy_app_autoexec_fail_message_get(PyObject *UNUSED(self), void *UNUSED(closure))
diff --git a/source/blender/python/intern/bpy_app_handlers.c b/source/blender/python/intern/bpy_app_handlers.c
index 72bc5bbc910..e71fd80b63b 100644
--- a/source/blender/python/intern/bpy_app_handlers.c
+++ b/source/blender/python/intern/bpy_app_handlers.c
@@ -233,7 +233,7 @@ PyObject *BPY_app_handlers_struct(void)
 			funcstore = &funcstore_array[pos];
 			funcstore->func = bpy_app_generic_callback;
 			funcstore->alloc = 0;
-			funcstore->arg = SET_INT_IN_POINTER(pos);
+			funcstore->arg = POINTER_FROM_INT(pos);
 			BLI_callback_add(funcstore, pos);
 		}
 	}
@@ -292,7 +292,7 @@ void BPY_app_handlers_reset(const short do_all)
 /* the actual callback - not necessarily called from py */
 void bpy_app_generic_callback(struct Main *UNUSED(main), struct ID *id, void *arg)
 {
-	PyObject *cb_list = py_cb_array[GET_INT_FROM_POINTER(arg)];
+	PyObject *cb_list = py_cb_array[POINTER_AS_INT(arg)];
 	if (PyList_GET_SIZE(cb_list) > 0) {
 		PyGILState_STATE gilstate = PyGILState_Ensure();