From 4dd46f7ca16c4b7a7a458c7642967aa7430c3786 Mon Sep 17 00:00:00 2001 From: David Rose Date: Wed, 9 Mar 2005 19:41:20 +0000 Subject: [PATCH] don't attempt to pack molecular fields --- direct/src/dcparser/dcClassParameter.cxx | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/direct/src/dcparser/dcClassParameter.cxx b/direct/src/dcparser/dcClassParameter.cxx index f98c27e247..1f2678fd7f 100644 --- a/direct/src/dcparser/dcClassParameter.cxx +++ b/direct/src/dcparser/dcClassParameter.cxx @@ -35,13 +35,8 @@ DCClassParameter(const DCClass *dclass) : int num_fields = _dclass->get_num_inherited_fields(); _has_nested_fields = true; - _num_nested_fields = num_fields; - if (_dclass->has_constructor()) { - _num_nested_fields++; - } _pack_type = PT_class; - _nested_fields.reserve(_num_nested_fields); if (_dclass->has_constructor()) { DCField *field = _dclass->get_constructor(); _nested_fields.push_back(field); @@ -50,9 +45,12 @@ DCClassParameter(const DCClass *dclass) : int i; for (i = 0 ; i < num_fields; i++) { DCField *field = _dclass->get_inherited_field(i); - _nested_fields.push_back(field); - _has_default_value = _has_default_value || field->has_default_value(); + if (!field->as_molecular_field()) { + _nested_fields.push_back(field); + _has_default_value = _has_default_value || field->has_default_value(); + } } + _num_nested_fields = _nested_fields.size(); // If all of the nested fields have a fixed byte size, then so does // the class (and its byte size is the sum of all of the nested