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

fix crash in sprite renderer

This commit is contained in:
David Rose 2006-04-25 14:00:20 +00:00
parent 160c848b68
commit da9e4f8906
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
panda/src/gobj/geomVertexReader.cxx
View File

@ -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();

10
panda/src/gobj/geomVertexWriter.cxx
View File

@ -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();