blender
/
blender
130
397
Fork 571
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

BGE: Fix invalid operator< for microsoft compiler. 

It fixes the strict weak ordering assertion failure, see : https://support.microsoft.com/en-us/kb/949171.
sybren and youle are the author of this commit.
This commit is contained in:
Porteries Tristan 2015-12-30 13:27:30 +01:00
parent 4145a4d08c
commit f320724195
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/gameengine/Ketsji/KX_TouchEventManager.cpp
View File

@ -235,5 +235,12 @@ KX_TouchEventManager::NewCollision::NewCollision(const NewCollision &to_copy)
bool KX_TouchEventManager::NewCollision::operator<(const NewCollision &other) const
{
return first < other.first || second < other.second || colldata < other.colldata;
//see strict weak ordering: https://support.microsoft.com/en-us/kb/949171
if (first == other.first) {
if (second == other.second) {
return colldata < other.colldata;
}
return second < other.second;
}
return first < other.first;
}