From 31c96523fb080f70917a921923139ef2b54c5393 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Fri, 27 Feb 2015 15:57:46 -0800 Subject: [PATCH] add support for transparency in RAW heightmaps --- libraries/metavoxels/src/Spanner.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/metavoxels/src/Spanner.cpp b/libraries/metavoxels/src/Spanner.cpp index fd5a59fdfb..d2dff016e3 100644 --- a/libraries/metavoxels/src/Spanner.cpp +++ b/libraries/metavoxels/src/Spanner.cpp @@ -648,7 +648,7 @@ void HeightfieldHeightEditor::select() { const float CONVERSION_SCALE = 65534.0f / numeric_limits::max(); for (int i = 0; i < rawSize; i++, dest += size) { for (quint16* lineDest = dest, *end = dest + rawSize; lineDest != end; lineDest++, src++) { - *lineDest = (quint16)(*src * CONVERSION_SCALE) + CONVERSION_OFFSET; + *lineDest = (*src == 0) ? 0 : (quint16)(*src * CONVERSION_SCALE) + CONVERSION_OFFSET; } } emit heightChanged(_height = new HeightfieldHeight(size, contents));