TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 02:15:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/1.9.x'

Browse Source
This commit is contained in:
rdb 2015-07-06 10:32:30 +02:00
commit cbcb2416d7
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dtool/src/interrogate/interfaceMakerPythonNative.cxx
View File

@ -6316,7 +6316,7 @@ write_make_seq(ostream &out, Object *obj, const std::string &ClassName,
<< " return NULL;\n"
<< " }\n"
<< "\n"
<< " PyObject *getter = PyObject_GetAttrString(self, \"" << element_name << "\");\n"
<< " PyObject *getter = PyDict_GetItemString(Dtool_" << ClassName << "._PyType.tp_dict, \"" << element_name << "\");\n"
<< " if (getter == (PyObject *)NULL) {\n"
<< " return NULL;\n"
<< " }\n"
@ -6330,7 +6330,7 @@ write_make_seq(ostream &out, Object *obj, const std::string &ClassName,
<< "#else\n"
<< " PyObject *index = PyInt_FromSsize_t(i);\n"
<< "#endif\n"
<< " PyObject *value = PyObject_CallFunctionObjArgs(getter, index, NULL);\n"
<< " PyObject *value = PyObject_CallFunctionObjArgs(getter, self, index, NULL);\n"
<< " PyTuple_SET_ITEM(tuple, i, value);\n"
<< " Py_DECREF(index);\n"
<< " }\n"

1
panda/src/x11display/x11GraphicsWindow.cxx
View File

@ -2148,7 +2148,6 @@ get_cursor(const Filename &filename) {
}
fi = _cursor_filenames.find(resolved);
if (fi != _cursor_filenames.end()) {
_cursor_filenames[filename] = (*fi).second;
return fi->second;
}