RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

try fix segfault (sorry!)

This commit is contained in:
rdb 2013-11-22 10:53:19 +00:00
parent 126573775a
commit 56334e73e8
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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