diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-04-29 15:39:25 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-04-29 15:41:48 +0400 |
| commit | 182e97a2cd4bdca9709dbbd1a4e6c175aed448a6 (patch) | |
| tree | f45ab52c59b21f2a9e77d09b6f729449c2be0999 /source/blender/render | |
| parent | 437bb528bd97339c4353c6fb9aa971822e12a4a7 (diff) | |
Fix T39941: Freestyle: Rendered preview crashes when non-primary render layer is selected and disabled.
Freestyle relies on render layer name (RenderLayer::name) to find the render layer that
corresponds to a scene render layer being rendered.
When the active render layer is disabled during preview rendering, the function
render_result_new() populates the list of render layers (RenderResult::layers) with an
unnamed render layer while setting the active scene render layer index to zero.
This commit fixes the missing initialization of the render layer name by referring to that of
the first in the list of scene render layers.
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/render_result.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/render/intern/source/render_result.c b/source/blender/render/intern/source/render_result.c index f63deff04ae..9056305823e 100644 --- a/source/blender/render/intern/source/render_result.c +++ b/source/blender/render/intern/source/render_result.c @@ -604,6 +604,8 @@ RenderResult *render_result_new(Render *re, rcti *partrct, int crop, int savebuf rl->passflag = SCE_PASS_COMBINED; re->r.actlay = 0; + srl = BLI_findlink(&re->r.layers, re->r.actlay); + BLI_strncpy(rl->name, srl->name, sizeof(rl->name)); } /* border render; calculate offset for use in compositor. compo is centralized coords */ |