From 32d5f7135f6e40ef591214ed700ec14f29cb1776 Mon Sep 17 00:00:00 2001 From: sabrina-shanman Date: Wed, 13 Mar 2019 14:50:50 -0700 Subject: [PATCH] Give the oven model-baker Baker an appropriate materialMappingBaseURL, but disable ParseMaterialMappingTask for now --- libraries/baking/src/ModelBaker.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libraries/baking/src/ModelBaker.cpp b/libraries/baking/src/ModelBaker.cpp index d38b965f6d..c120153ddf 100644 --- a/libraries/baking/src/ModelBaker.cpp +++ b/libraries/baking/src/ModelBaker.cpp @@ -249,12 +249,15 @@ void ModelBaker::bakeSourceCopy() { serializerMapping["combineParts"] = true; // set true so that OBJSerializer reads material info from material library hfm::Model::Pointer loadedModel = serializer->read(modelData, serializerMapping, _modelURL); - baker::Baker baker(loadedModel, serializerMapping, hifi::URL()); + baker::Baker baker(loadedModel, serializerMapping, _mappingURL); auto config = baker.getConfiguration(); // Enable compressed draco mesh generation config->getJobConfig("BuildDracoMesh")->setEnabled(true); // Do not permit potentially lossy modification of joint data meant for runtime ((PrepareJointsConfig*)config->getJobConfig("PrepareJoints"))->passthrough = true; + // The resources parsed from this job will not be used for now + // TODO: Proper full baking of all materials for a model + config->getJobConfig("ParseMaterialMapping")->setEnabled(false); // Begin hfm baking baker.run();