TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 02:42:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

implicitly drop an empty array during register_format()

Browse Source
This commit is contained in:
David Rose 2011-06-09 18:52:39 +00:00
parent 09dd200c58
commit 1e10f5238a
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
panda/src/gobj/geomVertexFormat.cxx
View File

@ -713,12 +713,23 @@ do_register() {
nassertv(!is_registered()); nassertv(!is_registered());
nassertv(_columns_by_name.empty()); nassertv(_columns_by_name.empty());
for (int array = 0; array < (int)_arrays.size(); ++array) { Arrays orig_arrays;
CPT(GeomVertexArrayFormat) array_format = _arrays[array]; orig_arrays.swap(_arrays);
Arrays::const_iterator ai;
for (ai = orig_arrays.begin(); ai != orig_arrays.end(); ++ai) {
CPT(GeomVertexArrayFormat) array_format = (*ai);
if (!array_format->is_registered()) { if (!array_format->is_registered()) {
array_format = GeomVertexArrayFormat::register_format(array_format); array_format = GeomVertexArrayFormat::register_format(array_format);
_arrays[array] = (GeomVertexArrayFormat *)array_format.p();
} }
if (array_format->get_num_columns() == 0) {
// Don't keep an empty array.
gobj_cat.warning()
<< "Dropping empty array from GeomVertexFormat.\n";
continue;
}
int array = (int)_arrays.size();
_arrays.push_back((GeomVertexArrayFormat *)array_format.p());
// Now add the names to the index. // Now add the names to the index.
int num_columns = array_format->get_num_columns(); int num_columns = array_format->get_num_columns();
@ -1063,6 +1074,10 @@ register_format(GeomVertexFormat *format) {
new_format = (*fi); new_format = (*fi);
if (!new_format->is_registered()) { if (!new_format->is_registered()) {
new_format->do_register(); new_format->do_register();
if (new_format->get_num_arrays() == 0) {
gobj_cat.warning()
<< "Empty GeomVertexFormat registered.\n";
}
} }
} }