From 8a9f3b9508dc6c748bd831944d7d070f9253c508 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 4 Jun 2019 12:56:08 -0700 Subject: [PATCH] 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 {