From 3ba5f8e5749694a5e73d81fb36902f90c1ba98cd Mon Sep 17 00:00:00 2001 From: NissimHadar Date: Fri, 29 Mar 2019 11:48:15 -0700 Subject: [PATCH] Use place holder instead of RCC file. (cherry picked from commit 709515dd7408d3283dedc00098bdfb85e2b94dd2) (cherry picked from commit 4e4526fbb253fb394492e4ec6430a5ddce87cb3f) --- libraries/baking/src/MaterialBaker.h | 7 ++++++- tools/nitpick/compiledResources/.placeholder | 0 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 tools/nitpick/compiledResources/.placeholder diff --git a/libraries/baking/src/MaterialBaker.h b/libraries/baking/src/MaterialBaker.h index d0ea33268e..ab2a0a5901 100644 --- a/libraries/baking/src/MaterialBaker.h +++ b/libraries/baking/src/MaterialBaker.h @@ -66,7 +66,12 @@ private: TextureFileNamer _textureFileNamer; void addTexture(const QString& materialName, image::TextureUsage::Type textureUsage, const hfm::Texture& texture); - std::unordered_map>> _textureContentMap; + struct TextureUsageHash { + std::size_t operator()(image::TextureUsage::Type textureUsage) const { + return static_cast(textureUsage); + } + }; + std::unordered_map, TextureUsageHash>> _textureContentMap; }; #endif // !hifi_MaterialBaker_h diff --git a/tools/nitpick/compiledResources/.placeholder b/tools/nitpick/compiledResources/.placeholder new file mode 100644 index 0000000000..e69de29bb2