mo2/modorganizer-plugin_python
0
0
Fork 0
mirror of https://github.com/ModOrganizer2/modorganizer-plugin_python.git synced 2026-07-27 14:03:33 -07:00
Code Issues Packages Projects Releases Wiki Activity

Allow None value from python in functor converter.

Browse Source
This commit is contained in:
Mikaël Capelle
2020-05-16 17:37:41 +02:00
parent 23c6f3fad9
commit fae9f1b52f
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/runner/converters.h
+15 -2
View File
@@ -368,6 +368,12 @@ namespace utils {
static void* convertible(PyObject* object)
{
// We allow None here, we will just default-construct a std::function:
if (object == Py_None) {
return object;
}
// Otherwize we check that we have a callable object:
if (!PyCallable_Check(object) || !has_arity(object, sizeof...(PARAMS))) {
return nullptr;
}
@@ -377,12 +383,19 @@ namespace utils {
static void construct(PyObject* object, bpy::converter::rvalue_from_python_stage1_data* data)
{
bpy::object callable(bpy::handle<>(bpy::borrowed(object)));
void* storage = ((bpy::converter::rvalue_from_python_storage<std::function<RET(PARAMS...)>>*)data)->storage.bytes;
new (storage) std::function<RET(PARAMS...)>(FunctorWrapper(callable));
void* storage =((bpy::converter::rvalue_from_python_storage<std::function<RET(PARAMS...)>>*)data)->storage.bytes;
if (callable.is_none()) {
new (storage) std::function<RET(PARAMS...)>{};
}
else {
new (storage) std::function<RET(PARAMS...)>(FunctorWrapper(callable));
}
data->convertible = storage;
}
};
/**
* @brief Call policy that automatically downcast shared pointer of type FromType
* to shared pointer of type ToType.