Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-04-12 02:52:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #15391 from sabrina-shanman/hfm_disable-embedded-materials_master

Browse source 
(master) Disable baking of embedded material textures in material entities
This commit is contained in:
Sam Gateau 2019-04-15 15:51:41 -07:00 committed by GitHub
commit db9df76337
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tools/oven/src/DomainBaker.cpp
View file

@ -412,9 +412,13 @@ void DomainBaker::enumerateEntities() {
if (entity.contains(MATERIAL_URL_KEY)) {
addMaterialBaker(MATERIAL_URL_KEY, entity[MATERIAL_URL_KEY].toString(), true, *it);
}
// FIXME: Disabled for now because relative texture URLs are not supported for embedded materials in material entities
// We need to make texture URLs absolute in this particular case only, keeping in mind that FSTBaker also uses embedded materials
/*
if (entity.contains(MATERIAL_DATA_KEY)) {
addMaterialBaker(MATERIAL_DATA_KEY, entity[MATERIAL_DATA_KEY].toString(), false, *it);
}
*/
}
}