griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix missing Cycles cryptomatte metadata in renders.

Browse Source
This commit is contained in:
Brecht Van Lommel
2019-02-13 14:33:29 +01:00
parent eb7f2457e5
commit 1bbe770030
2 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
intern/cycles/blender/blender_session.cpp
View File

@@ -393,12 +393,16 @@ static void add_cryptomatte_layer(BL::RenderResult& b_rr, string name, string ma
render_add_metadata(b_rr, prefix+"manifest", manifest);
}
void BlenderSession::stamp_view_layer_metadata_do(const string& prefix)
void BlenderSession::stamp_view_layer_metadata(Scene *scene, const string& view_layer_name)
{
BL::RenderResult b_rr = b_engine.get_result();
string prefix = "cycles." + view_layer_name + ".";
/* Configured number of samples for the view layer. */
b_rr.stamp_data_add_field((prefix + "samples").c_str(),
to_string(session->params.samples).c_str());
b_rr.stamp_data_add_field(
(prefix + "samples").c_str(),
to_string(session->params.samples).c_str());
/* Store ranged samples information. */
if(session->tile_manager.range_num_samples != -1) {
b_rr.stamp_data_add_field(
@@ -408,11 +412,20 @@ void BlenderSession::stamp_view_layer_metadata_do(const string& prefix)
(prefix + "range_num_samples").c_str(),
to_string(session->tile_manager.range_num_samples).c_str());
}
}
void BlenderSession::stamp_view_layer_metadata(const string& view_layer_name)
{
stamp_view_layer_metadata_do("cycles." + view_layer_name + ".");
/* Write cryptomatte metadata. */
if(scene->film->cryptomatte_passes & CRYPT_OBJECT) {
add_cryptomatte_layer(b_rr, view_layer_name + ".CryptoObject",
scene->object_manager->get_cryptomatte_objects(scene));
}
if(scene->film->cryptomatte_passes & CRYPT_MATERIAL) {
add_cryptomatte_layer(b_rr, view_layer_name + ".CryptoMaterial",
scene->shader_manager->get_cryptomatte_materials(scene));
}
if(scene->film->cryptomatte_passes & CRYPT_ASSET) {
add_cryptomatte_layer(b_rr, view_layer_name + ".CryptoAsset",
scene->object_manager->get_cryptomatte_assets(scene));
}
}
void BlenderSession::render(BL::Depsgraph& b_depsgraph_)
@@ -540,21 +553,8 @@ void BlenderSession::render(BL::Depsgraph& b_depsgraph_)
break;
}
stamp_view_layer_metadata(b_rlay_name);
/* Write cryptomatte metadata. */
if(scene->film->cryptomatte_passes & CRYPT_OBJECT) {
add_cryptomatte_layer(b_rr, b_rlay_name+".CryptoObject",
scene->object_manager->get_cryptomatte_objects(scene));
}
if(scene->film->cryptomatte_passes & CRYPT_MATERIAL) {
add_cryptomatte_layer(b_rr, b_rlay_name+".CryptoMaterial",
scene->shader_manager->get_cryptomatte_materials(scene));
}
if(scene->film->cryptomatte_passes & CRYPT_ASSET) {
add_cryptomatte_layer(b_rr, b_rlay_name+".CryptoAsset",
scene->object_manager->get_cryptomatte_assets(scene));
}
/* add metadata */
stamp_view_layer_metadata(scene, b_rlay_name);
/* free result without merging */
end_render_result(b_engine, b_rr, true, true, false);

3
intern/cycles/blender/blender_session.h
View File

@@ -151,8 +151,7 @@ public:
static bool print_render_stats;
protected:
void stamp_view_layer_metadata(const string& view_layer_name);
void stamp_view_layer_metadata_do(const string& prefix);
void stamp_view_layer_metadata(Scene *scene, const string& view_layer_name);
void do_write_update_render_result(BL::RenderResult& b_rr,
BL::RenderLayer& b_rlay,