From 06436e6a7d97bca388aeb2f444f73abe127a1276 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 4 Jun 2019 12:52:09 -0700 Subject: [PATCH 01/16] quiet build warning --- interface/src/Application.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 34af465485..4a0bce5103 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1311,12 +1311,12 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo accountManager->setAuthURL(NetworkingConstants::METAVERSE_SERVER_URL()); // use our MyAvatar position and quat for address manager path - addressManager->setPositionGetter([this] { + addressManager->setPositionGetter([] { auto avatarManager = DependencyManager::get(); auto myAvatar = avatarManager ? avatarManager->getMyAvatar() : nullptr; return myAvatar ? myAvatar->getWorldFeetPosition() : Vectors::ZERO; }); - addressManager->setOrientationGetter([this] { + addressManager->setOrientationGetter([] { auto avatarManager = DependencyManager::get(); auto myAvatar = avatarManager ? avatarManager->getMyAvatar() : nullptr; return myAvatar ? myAvatar->getWorldOrientation() : glm::quat(); From c5eb9c03d5a4c37eabfbf5ba47491ec26b9dbfb8 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 4 Jun 2019 12:52:28 -0700 Subject: [PATCH 02/16] fix uninitialized read --- interface/src/avatar/MyAvatar.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100755 => 100644 interface/src/avatar/MyAvatar.h diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h old mode 100755 new mode 100644 index 058603f320..9fb6c85a78 --- a/interface/src/avatar/MyAvatar.h +++ b/interface/src/avatar/MyAvatar.h @@ -2603,7 +2603,7 @@ private: bool _enableDebugDrawIKChains { false }; bool _enableDebugDrawDetailedCollision { false }; - mutable bool _cauterizationNeedsUpdate; // do we need to scan children and update their "cauterized" state? + mutable bool _cauterizationNeedsUpdate { false }; // do we need to scan children and update their "cauterized" state? AudioListenerMode _audioListenerMode; glm::vec3 _customListenPosition; From d1824c4d6db983f6c1aed77ba0081bf57b7b3125 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 4 Jun 2019 12:52:56 -0700 Subject: [PATCH 03/16] remove spammy log --- libraries/animation/src/AnimationCache.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/libraries/animation/src/AnimationCache.cpp b/libraries/animation/src/AnimationCache.cpp index 237fd3da02..e4afbd06e4 100644 --- a/libraries/animation/src/AnimationCache.cpp +++ b/libraries/animation/src/AnimationCache.cpp @@ -136,7 +136,6 @@ void Animation::downloadFinished(const QByteArray& data) { } void Animation::animationParseSuccess(HFMModel::Pointer hfmModel) { - qCDebug(animation) << "Animation parse success"; _hfmModel = hfmModel; finishedLoading(true); } From 426f97fb35bcb5eda693c816613ebd34374e9843 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 4 Jun 2019 12:53:12 -0700 Subject: [PATCH 04/16] avoid div by zero --- libraries/avatars-renderer/src/avatars-renderer/Head.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libraries/avatars-renderer/src/avatars-renderer/Head.cpp b/libraries/avatars-renderer/src/avatars-renderer/Head.cpp index 9cf034863e..2e8bedbb36 100644 --- a/libraries/avatars-renderer/src/avatars-renderer/Head.cpp +++ b/libraries/avatars-renderer/src/avatars-renderer/Head.cpp @@ -230,7 +230,11 @@ void Head::applyEyelidOffset(glm::quat headOrientation) { const float OPEN_DOWN_MULTIPLIER = 0.3f; const float BROW_UP_MULTIPLIER = 0.5f; - glm::vec3 lookAt = glm::normalize(getLookAtPosition() - _eyePosition); + glm::vec3 lookAtVector = getLookAtPosition() - _eyePosition; + if (glm::length2(lookAtVector) == 0.0f) { + return; + } + glm::vec3 lookAt = glm::normalize(lookAtVector); glm::vec3 headUp = headOrientation * Vectors::UNIT_Y; float eyePitch = (PI / 2.0f) - acos(glm::dot(lookAt, headUp)); float eyelidOffset = glm::clamp(abs(eyePitch * EYE_PITCH_TO_COEFFICIENT), 0.0f, MAX_EYELID_OFFSET); From 50e99cc1fdcec772d6f9687b29ba6cfd231ce898 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 4 Jun 2019 12:55:04 -0700 Subject: [PATCH 05/16] fix uninitialized read --- libraries/entities-renderer/src/RenderableGizmoEntityItem.h | 2 +- libraries/shared/src/GizmoType.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/libraries/entities-renderer/src/RenderableGizmoEntityItem.h b/libraries/entities-renderer/src/RenderableGizmoEntityItem.h index 2061bb0bca..ba59fdc728 100644 --- a/libraries/entities-renderer/src/RenderableGizmoEntityItem.h +++ b/libraries/entities-renderer/src/RenderableGizmoEntityItem.h @@ -33,7 +33,7 @@ private: virtual void doRenderUpdateAsynchronousTyped(const TypedEntityPointer& entity) override; virtual void doRender(RenderArgs* args) override; - GizmoType _gizmoType; + GizmoType _gizmoType { UNSET_GIZMO_TYPE }; RingGizmoPropertyGroup _ringProperties; PrimitiveMode _prevPrimitiveMode; diff --git a/libraries/shared/src/GizmoType.h b/libraries/shared/src/GizmoType.h index ce57fe97c2..464fef087d 100644 --- a/libraries/shared/src/GizmoType.h +++ b/libraries/shared/src/GizmoType.h @@ -26,6 +26,7 @@ enum GizmoType { RING = 0, + UNSET_GIZMO_TYPE }; class GizmoTypeHelpers { From 8a9f3b9508dc6c748bd831944d7d070f9253c508 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 4 Jun 2019 12:56:08 -0700 Subject: [PATCH 06/16] fix uninitialized read --- .../entities-renderer/src/RenderableMaterialEntityItem.h | 4 ++-- libraries/shared/src/MaterialMappingMode.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libraries/entities-renderer/src/RenderableMaterialEntityItem.h b/libraries/entities-renderer/src/RenderableMaterialEntityItem.h index d714727c7a..0c347155e0 100644 --- a/libraries/entities-renderer/src/RenderableMaterialEntityItem.h +++ b/libraries/entities-renderer/src/RenderableMaterialEntityItem.h @@ -41,8 +41,8 @@ private: quint16 _priority; QUuid _parentID; - MaterialMappingMode _materialMappingMode; - bool _materialRepeat; + MaterialMappingMode _materialMappingMode { UNSET_MATERIAL_MAPPING_MODE }; + bool _materialRepeat { false }; glm::vec2 _materialMappingPos; glm::vec2 _materialMappingScale; float _materialMappingRot; diff --git a/libraries/shared/src/MaterialMappingMode.h b/libraries/shared/src/MaterialMappingMode.h index 848c2aa28c..190c0603b2 100644 --- a/libraries/shared/src/MaterialMappingMode.h +++ b/libraries/shared/src/MaterialMappingMode.h @@ -13,7 +13,8 @@ enum MaterialMappingMode { UV = 0, - PROJECTED + PROJECTED, + UNSET_MATERIAL_MAPPING_MODE }; class MaterialMappingModeHelpers { From 766a5c7f81ba6fb8a594aa152d8398e114817f53 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 4 Jun 2019 12:56:29 -0700 Subject: [PATCH 07/16] avoid div by zero --- .../entities-renderer/src/RenderablePolyLineEntityItem.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp index d7246f9ba5..6cdc25d7b3 100644 --- a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp @@ -177,6 +177,9 @@ void PolyLineEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& void PolyLineEntityRenderer::updateGeometry() { int maxNumVertices = std::min(_points.length(), _normals.length()); + if (maxNumVertices < 1) { + return; + } bool doesStrokeWidthVary = false; if (_widths.size() > 0) { float prevWidth = _widths[0]; From 7ee64258ec0430745e1139f82a6b110ab578372d Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 4 Jun 2019 12:57:20 -0700 Subject: [PATCH 08/16] fix uninitialized read --- .../entities-renderer/src/RenderablePolyLineEntityItem.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h index adb30362da..fa6fff98d7 100644 --- a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h +++ b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h @@ -51,9 +51,9 @@ protected: float _textureAspectRatio { 1.0f }; bool _textureLoaded { false }; - bool _isUVModeStretch; - bool _faceCamera; - bool _glow; + bool _isUVModeStretch { false }; + bool _faceCamera { false }; + bool _glow { false }; size_t _numVertices; gpu::BufferPointer _polylineDataBuffer; From 8a32d230a880c930f010d7f498ce1003d9d26eba Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 4 Jun 2019 12:57:36 -0700 Subject: [PATCH 09/16] avoid div by zero --- libraries/entities/src/EntityTree.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp index 652266bd48..dbc347631d 100644 --- a/libraries/entities/src/EntityTree.cpp +++ b/libraries/entities/src/EntityTree.cpp @@ -827,7 +827,12 @@ EntityItemID EntityTree::evalRayIntersection(const glm::vec3& origin, const glm: PickFilter searchFilter, OctreeElementPointer& element, float& distance, BoxFace& face, glm::vec3& surfaceNormal, QVariantMap& extraInfo, Octree::lockType lockType, bool* accurateResult) { - RayArgs args = { origin, direction, 1.0f / direction, entityIdsToInclude, entityIdsToDiscard, + + // calculate dirReciprocal like this rather than with glm's scalar / vec3 template to avoid NaNs. + vec3 dirReciprocal = glm::vec3(direction.x == 0.0f ? 0.0f : 1.0f / direction.x, + direction.y == 0.0f ? 0.0f : 1.0f / direction.y, + direction.z == 0.0f ? 0.0f : 1.0f / direction.z); + RayArgs args = { origin, direction, dirReciprocal, entityIdsToInclude, entityIdsToDiscard, searchFilter, element, distance, face, surfaceNormal, extraInfo, EntityItemID() }; distance = FLT_MAX; From 32de196a2ce43cc579a528ce4ac7ae83d60fd109 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 4 Jun 2019 12:57:55 -0700 Subject: [PATCH 10/16] remove some spammy logging --- libraries/fbx/src/FBXSerializer_Node.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/libraries/fbx/src/FBXSerializer_Node.cpp b/libraries/fbx/src/FBXSerializer_Node.cpp index 717bc113dd..a2772d02d7 100644 --- a/libraries/fbx/src/FBXSerializer_Node.cpp +++ b/libraries/fbx/src/FBXSerializer_Node.cpp @@ -385,7 +385,6 @@ FBXNode FBXSerializer::parseFBX(QIODevice* device) { quint32 fileVersion; in >> fileVersion; position += sizeof(fileVersion); - qCDebug(modelformat) << "fileVersion:" << fileVersion; bool has64BitPositions = (fileVersion >= FBX_VERSION_2016); // parse the top-level node From 16d259f54fdbc44d88b899532a3c2b69972496aa Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 4 Jun 2019 12:58:15 -0700 Subject: [PATCH 11/16] fix uninitialized read --- libraries/image/src/image/Image.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/image/src/image/Image.h b/libraries/image/src/image/Image.h index 129061900f..dd39383dfb 100644 --- a/libraries/image/src/image/Image.h +++ b/libraries/image/src/image/Image.h @@ -128,7 +128,7 @@ namespace image { QImage _packedData; FloatPixels _floatData; glm::ivec2 _dims; - Format _format; + Format _format { Format_Invalid }; }; } // namespace image From 0d2bc23a63cf649cb74ab67344ad66fc07daeb49 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 4 Jun 2019 12:58:33 -0700 Subject: [PATCH 12/16] avoid crash on shutdown --- libraries/networking/src/LimitedNodeList.cpp | 9 --------- libraries/networking/src/LimitedNodeList.h | 11 +++++++++-- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp index 0eda2ee2e0..4ab1843ec3 100644 --- a/libraries/networking/src/LimitedNodeList.cpp +++ b/libraries/networking/src/LimitedNodeList.cpp @@ -43,15 +43,6 @@ static Setting::Handle LIMITED_NODELIST_LOCAL_PORT("LimitedNodeList.Loc using namespace std::chrono_literals; static const std::chrono::milliseconds CONNECTION_RATE_INTERVAL_MS = 1s; -const std::set SOLO_NODE_TYPES = { - NodeType::AvatarMixer, - NodeType::AudioMixer, - NodeType::AssetServer, - NodeType::EntityServer, - NodeType::MessagesMixer, - NodeType::EntityScriptServer -}; - LimitedNodeList::LimitedNodeList(int socketListenPort, int dtlsListenPort) : _nodeSocket(this), _packetReceiver(new PacketReceiver(this)) diff --git a/libraries/networking/src/LimitedNodeList.h b/libraries/networking/src/LimitedNodeList.h index 9f4a0177f5..f7ea0ec2ad 100644 --- a/libraries/networking/src/LimitedNodeList.h +++ b/libraries/networking/src/LimitedNodeList.h @@ -53,8 +53,6 @@ const quint64 NODE_SILENCE_THRESHOLD_MSECS = 10 * 1000; static const size_t DEFAULT_MAX_CONNECTION_RATE { std::numeric_limits::max() }; -extern const std::set SOLO_NODE_TYPES; - const char DEFAULT_ASSIGNMENT_SERVER_HOSTNAME[] = "localhost"; const char STUN_SERVER_HOSTNAME[] = "stun.highfidelity.io"; @@ -330,6 +328,15 @@ public: float getInboundKbps() const { return _inboundKbps; } float getOutboundKbps() const { return _outboundKbps; } + const std::set SOLO_NODE_TYPES = { + NodeType::AvatarMixer, + NodeType::AudioMixer, + NodeType::AssetServer, + NodeType::EntityServer, + NodeType::MessagesMixer, + NodeType::EntityScriptServer + }; + public slots: void reset(); void eraseAllNodes(); From 55daef837a8bad4b91fe779fbd55dbbdad27c019 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 4 Jun 2019 12:58:50 -0700 Subject: [PATCH 13/16] fix uninitialized read --- .../material-networking/src/material-networking/TextureCache.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/material-networking/src/material-networking/TextureCache.h b/libraries/material-networking/src/material-networking/TextureCache.h index a328622885..754263566b 100644 --- a/libraries/material-networking/src/material-networking/TextureCache.h +++ b/libraries/material-networking/src/material-networking/TextureCache.h @@ -96,7 +96,7 @@ private: friend class KTXReader; friend class ImageReader; - image::TextureUsage::Type _type; + image::TextureUsage::Type _type { image::TextureUsage::UNUSED_TEXTURE }; image::ColorChannel _sourceChannel; enum class ResourceType { From 8018a84e8b47f1d64e4a8bb6fdc2a12fb0460e7b Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 4 Jun 2019 12:59:03 -0700 Subject: [PATCH 14/16] avoid div by zero --- libraries/render-utils/src/AmbientOcclusionEffect.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libraries/render-utils/src/AmbientOcclusionEffect.cpp b/libraries/render-utils/src/AmbientOcclusionEffect.cpp index ee53347158..fd0d2c2522 100644 --- a/libraries/render-utils/src/AmbientOcclusionEffect.cpp +++ b/libraries/render-utils/src/AmbientOcclusionEffect.cpp @@ -474,6 +474,10 @@ void AmbientOcclusionEffect::updateBlurParameters() { } const auto occlusionSize = frameSize >> resolutionLevel; + if (occlusionSize.x == 0 || occlusionSize.y == 0) { + return; + } + // Occlusion UV limit hblur._blurAxis.z = occlusionSize.x / float(frameSize.x); hblur._blurAxis.w = occlusionSize.y / float(frameSize.y); From 07c2d80b0ce1231a11ae98270c4ea9a93b20db22 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 4 Jun 2019 13:29:16 -0700 Subject: [PATCH 15/16] fix ubuntu debian patch to track changes to Qt library handling --- debian/patches/hifi_use_system_qt.diff | 76 +++++++++++++------------- 1 file changed, 37 insertions(+), 39 deletions(-) diff --git a/debian/patches/hifi_use_system_qt.diff b/debian/patches/hifi_use_system_qt.diff index 2bd7009928..7f42e3e610 100644 --- a/debian/patches/hifi_use_system_qt.diff +++ b/debian/patches/hifi_use_system_qt.diff @@ -1,43 +1,41 @@ -Index: hifi-interface-84/cmake/macros/SetupQt.cmake +Index: hifi/cmake/macros/SetupQt.cmake =================================================================== ---- hifi-interface-84.orig/cmake/macros/SetupQt.cmake -+++ hifi-interface-84/cmake/macros/SetupQt.cmake -@@ -18,19 +18,19 @@ function(calculate_default_qt_dir _QT_VE - elseif(WIN32) - set(QT_DEFAULT_ARCH "msvc2017_64") - else() -- set(QT_DEFAULT_ARCH "gcc_64") -+ set(QT_DEFAULT_ARCH "x86_64-linux-gnu") - endif() +--- hifi.orig/cmake/macros/SetupQt.cmake ++++ hifi/cmake/macros/SetupQt.cmake +@@ -27,7 +27,7 @@ function(calculate_qt5_version result _Q + set(_QT_CORE_DIR "${_QT_DIR}/include/QtCore") + endif() + if(NOT EXISTS "${_QT_CORE_DIR}") +- message(FATAL_ERROR "Could not find 'include/QtCore' in '${_QT_DIR}'") ++ message("Could not find 'include/QtCore' in '${_QT_DIR}'") + endif() + set(subdirs "") + get_sub_directories(subdirs ${_QT_CORE_DIR}) +@@ -71,13 +71,13 @@ macro(setup_qt) - if (WIN32 OR (ANDROID AND ("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows"))) - set(QT_DEFAULT_ROOT "c:/Qt") - else() -- set(QT_DEFAULT_ROOT "$ENV{HOME}/Qt") -+ set(QT_DEFAULT_ROOT "/usr/lib") - endif() + message("QT_CMAKE_PREFIX_PATH = " ${QT_CMAKE_PREFIX_PATH}) - set_from_env(QT_ROOT QT_ROOT ${QT_DEFAULT_ROOT}) - set_from_env(QT_ARCH QT_ARCH ${QT_DEFAULT_ARCH}) +- # figure out where the qt dir is +- get_filename_component(QT_DIR "${QT_CMAKE_PREFIX_PATH}/../../" ABSOLUTE) +- set(QT_VERSION "unknown") +- calculate_qt5_version(QT_VERSION "${QT_DIR}") +- if (QT_VERSION STREQUAL "unknown") +- message(FATAL_ERROR "Could not determine QT_VERSION") +- endif() ++ # # figure out where the qt dir is ++ # get_filename_component(QT_DIR "${QT_CMAKE_PREFIX_PATH}/../../" ABSOLUTE) ++ # set(QT_VERSION "unknown") ++ # calculate_qt5_version(QT_VERSION "${QT_DIR}") ++ # if (QT_VERSION STREQUAL "unknown") ++ # message(FATAL_ERROR "Could not determine QT_VERSION") ++ # endif() -- set(${_RESULT_NAME} "${QT_ROOT}/${_QT_VERSION}/${QT_ARCH}" PARENT_SCOPE) -+ set(${_RESULT_NAME} "${QT_ROOT}/${QT_ARCH}" PARENT_SCOPE) - endfunction() - - # Sets the QT_CMAKE_PREFIX_PATH and QT_DIR variables -@@ -44,7 +44,7 @@ macro(setup_qt) - endif() - if (("QT_CMAKE_PREFIX_PATH" STREQUAL "") OR (NOT EXISTS "${QT_CMAKE_PREFIX_PATH}")) - calculate_default_qt_dir(${QT_VERSION} QT_DIR) -- set(QT_CMAKE_PREFIX_PATH "${QT_DIR}/lib/cmake") -+ set(QT_CMAKE_PREFIX_PATH "${QT_DIR}/cmake") - else() - # figure out where the qt dir is - get_filename_component(QT_DIR "${QT_CMAKE_PREFIX_PATH}/../../" ABSOLUTE) -Index: hifi-interface-84/interface/CMakeLists.txt + if(WIN32) + # windows shell does not like backslashes expanded on the command line, +Index: hifi/interface/CMakeLists.txt =================================================================== ---- hifi-interface-84.orig/interface/CMakeLists.txt -+++ hifi-interface-84/interface/CMakeLists.txt +--- hifi.orig/interface/CMakeLists.txt ++++ hifi/interface/CMakeLists.txt @@ -35,7 +35,7 @@ else () add_custom_command( OUTPUT ${RESOURCES_RCC} @@ -60,11 +58,11 @@ Index: hifi-interface-84/interface/CMakeLists.txt + endif() - if (SCRIPTS_INSTALL_DIR) -Index: hifi-interface-84/tools/nitpick/CMakeLists.txt + if (DEV_BUILD AND (APPLE OR UNIX)) +Index: hifi/tools/nitpick/CMakeLists.txt =================================================================== ---- hifi-interface-84.orig/tools/nitpick/CMakeLists.txt -+++ hifi-interface-84/tools/nitpick/CMakeLists.txt +--- hifi.orig/tools/nitpick/CMakeLists.txt ++++ hifi/tools/nitpick/CMakeLists.txt @@ -12,7 +12,7 @@ generate_qrc(OUTPUT ${RESOURCES_QRC} PAT add_custom_command( OUTPUT ${RESOURCES_RCC} From 02ff4ea2f524a51d22fb9e9471a68784447d4b46 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 4 Jun 2019 15:45:33 -0700 Subject: [PATCH 16/16] add some comments to help future devs --- libraries/shared/src/GizmoType.h | 1 + libraries/shared/src/MaterialMappingMode.h | 1 + 2 files changed, 2 insertions(+) diff --git a/libraries/shared/src/GizmoType.h b/libraries/shared/src/GizmoType.h index 464fef087d..fc047b257d 100644 --- a/libraries/shared/src/GizmoType.h +++ b/libraries/shared/src/GizmoType.h @@ -26,6 +26,7 @@ enum GizmoType { RING = 0, + // put new gizmo-types before this line. UNSET_GIZMO_TYPE }; diff --git a/libraries/shared/src/MaterialMappingMode.h b/libraries/shared/src/MaterialMappingMode.h index 190c0603b2..d95fbb339e 100644 --- a/libraries/shared/src/MaterialMappingMode.h +++ b/libraries/shared/src/MaterialMappingMode.h @@ -14,6 +14,7 @@ enum MaterialMappingMode { UV = 0, PROJECTED, + // put new mapping-modes before this line. UNSET_MATERIAL_MAPPING_MODE };