TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 02:42:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

oops, bad modifyState

Browse Source
This commit is contained in:
David Rose 2002-03-30 01:40:10 +00:00
parent 64ad508937
commit 88963dedb5
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -670,7 +670,7 @@ issue_delta_modify(const RenderState *other,
return return_new(new_state); return return_new(new_state);
} else { } else {
delete new_state; delete new_state;
return other; return this;
} }
} }
@ -693,9 +693,6 @@ issue_delta_set(const RenderState *other,
return 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 ai = _attributes.begin();
Attributes::const_iterator bi = other->_attributes.begin(); Attributes::const_iterator bi = other->_attributes.begin();