Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 12:53:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Crash fix.

Browse source
This commit is contained in:
Andrzej Kapolka 2015-01-12 12:00:01 -08:00
parent d002359989
commit 5f7a304c85
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/metavoxels/src/Spanner.cpp
View file

@ -2799,6 +2799,9 @@ void HeightfieldNode::mergeChildren(bool height, bool colorMaterial) {
QVector<quint16> heightContents(heightWidth * heightHeight);
for (int i = 0; i < CHILD_COUNT; i++) {
HeightfieldHeightPointer childHeight = _children[i]->getHeight();
if (!childHeight) {
continue;
}
int childHeightWidth = childHeight->getWidth();
int childHeightHeight = childHeight->getContents().size() / childHeightWidth;
if (childHeightWidth != heightWidth || childHeightHeight != heightHeight) {
@ -2919,6 +2922,9 @@ void HeightfieldNode::mergeChildren(bool height, bool colorMaterial) {
QVector<SharedObjectPointer> stackMaterials;
for (int i = 0; i < CHILD_COUNT; i++) {
HeightfieldStackPointer childStack = _children[i]->getStack();
if (!childStack) {
continue;
}
int childStackWidth = childStack->getWidth();
int childStackHeight = childStack->getContents().size() / childStackWidth;
if (childStackWidth != stackWidth || childStackHeight != stackHeight) {