Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-28 21:10:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #12898 from kitely/emissivemap-relative-path

Browse source 
In Material resources, support relative paths for 'emissiveMap'
This commit is contained in:
Sam Gateau 2018-04-19 10:25:02 -07:00 committed by GitHub
commit f87bfc14de
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/model-networking/src/model-networking/MaterialCache.cpp
View file

@ -194,7 +194,7 @@ std::pair<std::string, std::shared_ptr<NetworkMaterial>> NetworkMaterialResource
} else if (key == "emissiveMap") { } else if (key == "emissiveMap") {
auto value = materialJSON.value(key); auto value = materialJSON.value(key);
if (value.isString()) { if (value.isString()) {
material->setEmissiveMap(value.toString()); material->setEmissiveMap(baseUrl.resolved(value.toString()));
} }
} else if (key == "albedoMap") { } else if (key == "albedoMap") {
auto value = materialJSON.value(key); auto value = materialJSON.value(key);