Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-14 16:06:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use place holder instead of RCC file.

Browse source 
(cherry picked from commit 709515dd74)
(cherry picked from commit 4e4526fbb2)
This commit is contained in:
NissimHadar 2019-03-29 11:48:15 -07:00 committed by SamGondelman
parent 2b376f7881
commit 3ba5f8e574
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libraries/baking/src/MaterialBaker.h
View file

@ -66,7 +66,12 @@ private:
TextureFileNamer _textureFileNamer;
void addTexture(const QString& materialName, image::TextureUsage::Type textureUsage, const hfm::Texture& texture);
std::unordered_map<std::string, std::unordered_map<image::TextureUsage::Type, std::pair<QByteArray, QString>>> _textureContentMap;
struct TextureUsageHash {
std::size_t operator()(image::TextureUsage::Type textureUsage) const {
return static_cast<std::size_t>(textureUsage);
}
};
std::unordered_map<std::string, std::unordered_map<image::TextureUsage::Type, std::pair<QByteArray, QString>, TextureUsageHash>> _textureContentMap;
};
#endif // !hifi_MaterialBaker_h

0
tools/nitpick/compiledResources/.placeholder Normal file
View file