BogdanNagirniak/blender
0
0
Fork 3
forked from blender/blender
Code Pull Requests Activity

Collection of bugfixes #76

Merged
Brecht Van Lommel merged 6 commits from brecht/blender:hydra-fixes into hydra-render 2023-07-27 13:38:26 +02:00
Conversation 2 Commits 6 Files Changed 18 +15 -12
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 03f24159b8 - Show all commits

19
source/blender/render/hydra/final_engine.cc
View File

@ -98,23 +98,26 @@ void FinalEngine::notify_status(float progress, const std::string &title, const
void FinalEngine::update_render_result() void FinalEngine::update_render_result()
{ {
RenderResult *result = RE_engine_begin_result( RenderResult *rr = RE_engine_begin_result(
bl_engine_, 0, 0, resolution_[0], resolution_[1], layer_name_.c_str(), nullptr); bl_engine_, 0, 0, resolution_[0], resolution_[1], layer_name_.c_str(), nullptr);
/* TODO: only for the first render layer */ RenderLayer *rlayer = static_cast<RenderLayer *>(
RenderLayer *layer = (RenderLayer *)result->layers.first; BLI_findstring(&rr->layers, layer_name_.c_str(), offsetof(RenderLayer, name)));
for (RenderPass *pass = (RenderPass *)layer->passes.first; pass != nullptr; pass = pass->next) {
if (rlayer) {
LISTBASE_FOREACH (RenderPass *, rpass, &rlayer->passes) {
pxr::TfToken aov_key; pxr::TfToken aov_key;
if (STREQ(pass->name, "Combined")) { if (STREQ(rpass->name, "Combined")) {
aov_key = pxr::HdAovTokens->color; aov_key = pxr::HdAovTokens->color;
} }
else if (STREQ(pass->name, "Depth")) { else if (STREQ(rpass->name, "Depth")) {
aov_key = pxr::HdAovTokens->depth; aov_key = pxr::HdAovTokens->depth;
} }
render_task_delegate_->read_aov(aov_key, pass->ibuf->float_buffer.data); render_task_delegate_->read_aov(aov_key, rpass->ibuf->float_buffer.data);
}
} }
RE_engine_end_result(bl_engine_, result, false, false, false); RE_engine_end_result(bl_engine_, rr, false, false, false);
} }
} // namespace blender::render::hydra } // namespace blender::render::hydra