Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v2.92-release'

Browse Source
This commit is contained in:
Sebastian Parborg
2021-02-02 16:47:21 +01:00
parent 326102f498 f8359b5f52
commit d0aa7d5562
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
View File

@@ -500,6 +500,11 @@ void FRS_composite_result(Render *re, ViewLayer *view_layer, Render *freestyle_r
int x, y, rectx, recty; int x, y, rectx, recty;
if (freestyle_render == nullptr || freestyle_render->result == nullptr) { if (freestyle_render == nullptr || freestyle_render->result == nullptr) {
if (view_layer->freestyle_config.flags & FREESTYLE_AS_RENDER_PASS) {
// Create a blank render pass output.
RE_create_render_pass(
re->result, RE_PASSNAME_FREESTYLE, 4, "RGBA", view_layer->name, re->viewname);
}
return; return;
} }
@@ -677,8 +682,8 @@ void FRS_do_stroke_rendering(Render *re, ViewLayer *view_layer)
g_freestyle.scene = nullptr; g_freestyle.scene = nullptr;
// composite result // composite result
FRS_composite_result(re, view_layer, freestyle_render);
if (freestyle_render) { if (freestyle_render) {
FRS_composite_result(re, view_layer, freestyle_render);
RE_FreeRender(freestyle_render); RE_FreeRender(freestyle_render);
} }
} }