[Bf-blender-cvs] [4665a088734] master: Python: Fix to support old-style handlers

Sergey Sharybin noreply at git.blender.org
Wed Sep 11 16:30:06 CEST 2019


Commit: 4665a0887341a38606b7354ce9b29cf0c6cdb6aa
Author: Sergey Sharybin
Date:   Wed Sep 11 15:52:07 2019 +0200
Branches: master
https://developer.blender.org/rB4665a0887341a38606b7354ce9b29cf0c6cdb6aa

Python: Fix to support old-style handlers

Can not re-use single typle even if there is a single input pointer:
the all-arguments-typle consists of 2 elements.

===================================================================

M	source/blender/python/intern/bpy_app_handlers.c

===================================================================

diff --git a/source/blender/python/intern/bpy_app_handlers.c b/source/blender/python/intern/bpy_app_handlers.c
index e6a8febbf29..2fbefe3be74 100644
--- a/source/blender/python/intern/bpy_app_handlers.c
+++ b/source/blender/python/intern/bpy_app_handlers.c
@@ -333,9 +333,6 @@ void bpy_app_generic_callback(struct Main *UNUSED(main),
     if (num_pointers == 0) {
       PyTuple_SET_ITEM(args_single, 0, Py_INCREF_RET(Py_None));
     }
-    else if (num_pointers == 1) {
-      args_single = args_all;
-    }
     else {
       PyTuple_SET_ITEM(args_single, 0, pyrna_struct_CreatePyObject(pointers[0]));
     }
@@ -362,9 +359,7 @@ void bpy_app_generic_callback(struct Main *UNUSED(main),
     }
 
     Py_DECREF(args_all);
-    if (args_single != args_all) {
-      Py_DECREF(args_single);
-    }
+    Py_DECREF(args_single);
 
     PyGILState_Release(gilstate);
   }



More information about the Bf-blender-cvs mailing list