RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

non-multiple implies non-virtual inheritance

This commit is contained in:
David Rose 2006-01-10 17:17:10 +00:00
parent 413377b78c
commit eabae807bd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
direct/src/dcparser/dcClass.cxx
View File

@ -274,7 +274,7 @@ get_field_by_index(int index_number) const {
////////////////////////////////////////////////////////////////////
int DCClass::
get_num_inherited_fields() const {
if (dc_virtual_inheritance) {
if (dc_multiple_inheritance && dc_virtual_inheritance) {
if (_dc_file != (DCFile *)NULL) {
_dc_file->check_inherited_fields();
}
@ -309,7 +309,7 @@ get_num_inherited_fields() const {
////////////////////////////////////////////////////////////////////
DCField *DCClass::
get_inherited_field(int n) const {
if (dc_virtual_inheritance) {
if (dc_multiple_inheritance && dc_virtual_inheritance) {
if (_dc_file != (DCFile *)NULL) {
_dc_file->check_inherited_fields();
}