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 when using DrawMaskAttrib to hide an object with decals

This commit is contained in:
David Rose 2005-09-29 22:25:55 +00:00
parent be0edea190
commit 6a788dd958
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
panda/src/pgraph/cullTraverser.cxx
View File

@ -542,6 +542,7 @@ start_decal(const CullTraverserData &data) {
new CullableObject(data, geom_node, i, object);
if (next_object->_state->has_cull_callback() &&
!next_object->_state->cull_callback(this, data)) {
next_object->_next = NULL;
delete next_object;
} else {
object = next_object;
@ -553,6 +554,9 @@ start_decal(const CullTraverserData &data) {
// processing. The first Geom in the node now represents the
// overall state.
_cull_handler->record_object(object, this);
} else {
// Never mind; there's nothing to render.
delete object;
}
}
@ -607,6 +611,7 @@ r_get_decals(CullTraverserData &data, CullableObject *decals) {
new CullableObject(data, geom_node, i, decals);
if (next_decals->_state->has_cull_callback() &&
!next_decals->_state->cull_callback(this, data)) {
next_decals->_next = NULL;
delete next_decals;
} else {
decals = next_decals;