mirror/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2026-05-05 06:00:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/1.10.x'

Browse Source
This commit is contained in:
rdb
2019-03-04 16:57:52 +01:00
parent 92e8b77344 8e4add0326
commit cbb3c182a5
16 changed files with 248 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dtool/src/interrogate/interfaceMakerPythonNative.cxx
+5 -2
View File
@@ -1690,7 +1690,6 @@ write_module_class(ostream &out, Object *obj) {
SlottedFunctionDef def;
def._answer_location = true_key;
def._wrapper_type = slotted_def._wrapper_type;
def._min_version = 0x03000000;
def._wrapper_name = func->_name + "_" + true_key;
slots[true_key] = def;
}
@@ -5993,7 +5992,11 @@ write_function_instance(ostream &out, FunctionRemap *remap,
indent(out, indent_level) << "}\n";
}
return_expr = manage_return_value(out, indent_level, remap, "return_value");
if (TypeManager::is_pointer_to_PyObject(remap->_return_type->get_orig_type())) {
indent(out, indent_level) << "Py_XINCREF(return_value);\n";
} else {
return_expr = manage_return_value(out, indent_level, remap, "return_value");
}
return_expr = remap->_return_type->temporary_to_return(return_expr);
}