diff --git a/dtool/src/interrogate/interfaceMakerPythonNative.cxx b/dtool/src/interrogate/interfaceMakerPythonNative.cxx index f0990dd0d8..51b2c0f2fc 100644 --- a/dtool/src/interrogate/interfaceMakerPythonNative.cxx +++ b/dtool/src/interrogate/interfaceMakerPythonNative.cxx @@ -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" diff --git a/panda/src/x11display/x11GraphicsWindow.cxx b/panda/src/x11display/x11GraphicsWindow.cxx index a443e95426..0258fd0bc6 100644 --- a/panda/src/x11display/x11GraphicsWindow.cxx +++ b/panda/src/x11display/x11GraphicsWindow.cxx @@ -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; }