TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-27 15:25:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/1.10.x'

Browse Source
This commit is contained in:
rdb 2022-07-24 21:43:09 +02:00
commit cf04a04e32
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
direct/src/distributed/ConnectionRepository.py
View File

@ -9,7 +9,6 @@ from direct.showbase import GarbageReport
from direct.showbase.MessengerGlobal import messenger
from .PyDatagramIterator import PyDatagramIterator
import inspect
import gc
__all__ = ["ConnectionRepository", "GCTrigger"]
@ -311,6 +310,8 @@ class ConnectionRepository(
# Now get the class definition for the classes named in the DC
# file.
import inspect
for i in range(dcFile.getNumClasses()):
dclass = dcFile.getClass(i)
number = dclass.getNumber()

13
dtool/src/interrogatedb/interrogate_interface.cxx
View File

@ -494,11 +494,22 @@ interrogate_make_seq_num_name(MakeSeqIndex make_seq) {
const char *
interrogate_make_seq_element_name(MakeSeqIndex make_seq) {
// cerr << "interrogate_make_seq_element_name(" << make_seq << ")\n";
static string result;
FunctionIndex function = InterrogateDatabase::get_ptr()->get_make_seq(make_seq).get_element_getter();
return interrogate_function_name(function);
}
FunctionIndex
interrogate_make_seq_num_getter(MakeSeqIndex make_seq) {
// cerr << "interrogate_make_seq_num_getter(" << make_seq << ")\n";
return InterrogateDatabase::get_ptr()->get_make_seq(make_seq).get_length_getter();
}
FunctionIndex
interrogate_make_seq_element_getter(MakeSeqIndex make_seq) {
// cerr << "interrogate_make_seq_element_getter(" << make_seq << ")\n";
return InterrogateDatabase::get_ptr()->get_make_seq(make_seq).get_element_getter();
}
int
interrogate_number_of_global_types() {
// cerr << "interrogate_number_of_global_types()\n";

3
dtool/src/interrogatedb/interrogate_interface.h
View File

@ -348,7 +348,8 @@ EXPCL_INTERROGATEDB const char *interrogate_make_seq_comment(ElementIndex elemen
EXPCL_INTERROGATEDB const char *interrogate_make_seq_num_name(MakeSeqIndex make_seq);
// The name of the real method that returns the nth element, e.g. "get_thing"
EXPCL_INTERROGATEDB const char *interrogate_make_seq_element_name(MakeSeqIndex make_seq);
EXPCL_INTERROGATEDB FunctionIndex interrogate_make_seq_num_getter(MakeSeqIndex make_seq);
EXPCL_INTERROGATEDB FunctionIndex interrogate_make_seq_element_getter(MakeSeqIndex make_seq);
// Types