Applied some warning/assert patches, thanks to Ole K.
http://code.google.com/p/bullet/issues/detail?id=186
This commit is contained in:
@@ -150,8 +150,7 @@ int btBvhTree::_sort_and_calc_splitting_index(
|
|||||||
splitIndex = startIndex+ (numIndices>>1);
|
splitIndex = startIndex+ (numIndices>>1);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool unbal = (splitIndex==startIndex) || (splitIndex == (endIndex));
|
btAssert(!((splitIndex==startIndex) || (splitIndex == (endIndex))));
|
||||||
btAssert(!unbal);
|
|
||||||
|
|
||||||
return splitIndex;
|
return splitIndex;
|
||||||
|
|
||||||
|
|||||||
@@ -171,8 +171,7 @@ int btQuantizedBvhTree::_sort_and_calc_splitting_index(
|
|||||||
splitIndex = startIndex+ (numIndices>>1);
|
splitIndex = startIndex+ (numIndices>>1);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool unbal = (splitIndex==startIndex) || (splitIndex == (endIndex));
|
btAssert(!((splitIndex==startIndex) || (splitIndex == (endIndex))));
|
||||||
btAssert(!unbal);
|
|
||||||
|
|
||||||
return splitIndex;
|
return splitIndex;
|
||||||
|
|
||||||
|
|||||||
@@ -110,7 +110,7 @@ GUINT GIM_BOX_TREE::_sort_and_calc_splitting_index(
|
|||||||
splitIndex = startIndex+ (numIndices>>1);
|
splitIndex = startIndex+ (numIndices>>1);
|
||||||
}
|
}
|
||||||
|
|
||||||
btAssert(!(splitIndex==startIndex) || (splitIndex == (endIndex)));
|
btAssert(!((splitIndex==startIndex) || (splitIndex == (endIndex))));
|
||||||
|
|
||||||
return splitIndex;
|
return splitIndex;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user