diff --git a/panda/src/gobj/geomVertexReader.cxx b/panda/src/gobj/geomVertexReader.cxx index e1f711cf70..1d37f9b042 100644 --- a/panda/src/gobj/geomVertexReader.cxx +++ b/panda/src/gobj/geomVertexReader.cxx @@ -108,7 +108,10 @@ initialize() { bool GeomVertexReader:: set_vertex_column(int array, const GeomVertexColumn *column, const GeomVertexDataPipelineReader *data_reader) { - nassertr(column != (const GeomVertexColumn *)NULL, false); + if (column == (const GeomVertexColumn *)NULL) { + return set_column(0, NULL); + } + nassertr(_vertex_data != (const GeomVertexData *)NULL, false); #ifndef NDEBUG @@ -138,7 +141,10 @@ set_vertex_column(int array, const GeomVertexColumn *column, bool GeomVertexReader:: set_array_column(const GeomVertexColumn *column, const GeomVertexArrayDataPipelineReader *array_reader) { - nassertr(column != (const GeomVertexColumn *)NULL, false); + if (column == (const GeomVertexColumn *)NULL) { + return set_column(0, NULL); + } + nassertr(_array_data != (const GeomVertexArrayData *)NULL, false); _stride = array_reader->get_array_format()->get_stride(); diff --git a/panda/src/gobj/geomVertexWriter.cxx b/panda/src/gobj/geomVertexWriter.cxx index 9c49494b59..2460f71131 100644 --- a/panda/src/gobj/geomVertexWriter.cxx +++ b/panda/src/gobj/geomVertexWriter.cxx @@ -113,7 +113,10 @@ initialize() { bool GeomVertexWriter:: set_vertex_column(int array, const GeomVertexColumn *column, GeomVertexDataPipelineWriter *data_writer) { - nassertr(column != (const GeomVertexColumn *)NULL, false); + if (column == (const GeomVertexColumn *)NULL) { + return set_column(0, NULL); + } + nassertr(_vertex_data != (GeomVertexData *)NULL, false); #ifndef NDEBUG @@ -143,7 +146,10 @@ set_vertex_column(int array, const GeomVertexColumn *column, bool GeomVertexWriter:: set_array_column(const GeomVertexColumn *column, GeomVertexArrayDataPipelineWriter *array_writer) { - nassertr(column != (const GeomVertexColumn *)NULL, false); + if (column == (const GeomVertexColumn *)NULL) { + return set_column(0, NULL); + } + nassertr(_array_data != (GeomVertexArrayData *)NULL, false); _stride = array_writer->get_array_format()->get_stride();