TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 16:58:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

interrogate: fix crash reading static property

Browse Source
This commit is contained in:
rdb 2018-11-24 22:44:09 +01:00
parent 3f91615a22
commit e32388c2f8
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6975,7 +6975,11 @@ write_getset(ostream &out, Object *obj, Property *property) {
out << " if (wrap != nullptr) {\n" out << " if (wrap != nullptr) {\n"
" wrap->_getitem_func = &Dtool_" << ClassName << "_" << ielem.get_name() << "_Mapping_Getitem;\n"; " wrap->_getitem_func = &Dtool_" << ClassName << "_" << ielem.get_name() << "_Mapping_Getitem;\n";
if (!property->_setter_remaps.empty()) { if (!property->_setter_remaps.empty()) {
out << " if (!DtoolInstance_IS_CONST(self)) {\n"; if (property->_has_this) {
out << " if (!DtoolInstance_IS_CONST(self)) {\n";
} else {
out << " {\n";
}
out << " wrap->_setitem_func = &Dtool_" << ClassName << "_" << ielem.get_name() << "_Mapping_Setitem;\n"; out << " wrap->_setitem_func = &Dtool_" << ClassName << "_" << ielem.get_name() << "_Mapping_Setitem;\n";
out << " }\n"; out << " }\n";
} }
@ -7006,7 +7010,11 @@ write_getset(ostream &out, Object *obj, Property *property) {
" wrap->_len_func = &Dtool_" << ClassName << "_" << ielem.get_name() << "_Len;\n" " wrap->_len_func = &Dtool_" << ClassName << "_" << ielem.get_name() << "_Len;\n"
" wrap->_getitem_func = &Dtool_" << ClassName << "_" << ielem.get_name() << "_Sequence_Getitem;\n"; " wrap->_getitem_func = &Dtool_" << ClassName << "_" << ielem.get_name() << "_Sequence_Getitem;\n";
if (!property->_setter_remaps.empty()) { if (!property->_setter_remaps.empty()) {
out << " if (!DtoolInstance_IS_CONST(self)) {\n"; if (property->_has_this) {
out << " if (!DtoolInstance_IS_CONST(self)) {\n";
} else {
out << " {\n";
}
out << " wrap->_setitem_func = &Dtool_" << ClassName << "_" << ielem.get_name() << "_Sequence_Setitem;\n"; out << " wrap->_setitem_func = &Dtool_" << ClassName << "_" << ielem.get_name() << "_Sequence_Setitem;\n";
if (property->_inserter != nullptr) { if (property->_inserter != nullptr) {
out << " wrap->_insert_func = &Dtool_" << ClassName << "_" << ielem.get_name() << "_Sequence_insert;\n"; out << " wrap->_insert_func = &Dtool_" << ClassName << "_" << ielem.get_name() << "_Sequence_insert;\n";