From 88963dedb58efc1cb9e50be07db0bace0904004b Mon Sep 17 00:00:00 2001 From: David Rose Date: Sat, 30 Mar 2002 01:40:10 +0000 Subject: [PATCH] oops, bad modifyState --- panda/src/pgraph/renderState.cxx | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/panda/src/pgraph/renderState.cxx b/panda/src/pgraph/renderState.cxx index 94504313da..4fffbfd61a 100644 --- a/panda/src/pgraph/renderState.cxx +++ b/panda/src/pgraph/renderState.cxx @@ -670,7 +670,7 @@ issue_delta_modify(const RenderState *other, return return_new(new_state); } else { delete new_state; - return other; + return this; } } @@ -693,9 +693,6 @@ issue_delta_set(const RenderState *other, return other; } - // We don't need to build a new RenderState, because the return - // value will be exactly other. - Attributes::const_iterator ai = _attributes.begin(); Attributes::const_iterator bi = other->_attributes.begin();