From 8a04a06b0b9b6770e951ae047899d8dbecf78593 Mon Sep 17 00:00:00 2001 From: David Rose Date: Fri, 21 Nov 2008 20:40:10 +0000 Subject: [PATCH] fix adjust_all_priorities --- panda/src/pgraph/renderState.cxx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/panda/src/pgraph/renderState.cxx b/panda/src/pgraph/renderState.cxx index d082aaf389..3635cfeb1f 100644 --- a/panda/src/pgraph/renderState.cxx +++ b/panda/src/pgraph/renderState.cxx @@ -677,15 +677,14 @@ remove_attrib(int slot) const { //////////////////////////////////////////////////////////////////// CPT(RenderState) RenderState:: adjust_all_priorities(int adjustment) const { - RenderState *new_state = new RenderState; + RenderState *new_state = new RenderState(*this); SlotMask mask = _filled_slots; int slot = mask.get_lowest_on_bit(); while (slot >= 0) { Attribute &attrib = new_state->_attributes[slot]; - if (attrib._attrib != (RenderAttrib *)NULL) { - attrib._override = max(attrib._override + adjustment, 0); - } + nassertr(attrib._attrib != (RenderAttrib *)NULL, this); + attrib._override = max(attrib._override + adjustment, 0); mask.clear_bit(slot); slot = mask.get_lowest_on_bit();