From 95a63cf1314a571e3bb81f876ee9aacb6f131e84 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Sat, 13 Sep 2014 09:14:52 -0700 Subject: [PATCH] fix windows warning and change QByteArray initializer to match documented prototype --- interface/src/ui/MetavoxelEditor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/ui/MetavoxelEditor.cpp b/interface/src/ui/MetavoxelEditor.cpp index cf839f6800..0f5c8dd048 100644 --- a/interface/src/ui/MetavoxelEditor.cpp +++ b/interface/src/ui/MetavoxelEditor.cpp @@ -1022,7 +1022,7 @@ void ImportHeightfieldTool::apply() { QByteArray color; if (buffer->getColor().isEmpty()) { - const int WHITE_VALUE = 0xFF; + const char WHITE_VALUE = 0xFF; color = QByteArray(height.size() * DataBlock::COLOR_BYTES, WHITE_VALUE); } else { color = buffer->getUnextendedColor();