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

fix LP bug 1133771, RenderState.compare_to does not work with state-cache or uniquify-attribs disabled

Browse Source
This commit is contained in:
rdb 2013-11-19 21:34:55 +00:00
parent 5b1ea47fee
commit 126573775a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -550,8 +550,9 @@ operator = (const Attribute &copy) {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
INLINE int RenderState::Attribute:: INLINE int RenderState::Attribute::
compare_to(const Attribute &other) const { compare_to(const Attribute &other) const {
if (_attrib != other._attrib) { int c = _attrib->compare_to(*other._attrib);
return _attrib < other._attrib ? -1 : 1; if (c != 0) {
return c;
} }
return _override - other._override; return _override - other._override;
} }