diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-04-08 15:07:34 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-04-08 15:07:34 +0300 |
| commit | a981206fd183355bdcc8331b3a74ce3d382e1f67 (patch) | |
| tree | efa5534ed691645530707a80cf4a2039909f79b7 /source/blender/editors/render/render_internal.c | |
| parent | 0b5ebb3265b155658d441135e152f32ba11c001d (diff) | |
| parent | 245e01c30ac296c509e04f702c6b5d76086265b5 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/render/render_internal.c')
| -rw-r--r-- | source/blender/editors/render/render_internal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index e1e5c788b02..f8b1861b204 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -643,7 +643,7 @@ static void render_image_restore_layer(RenderJob *rj) /* For single layer renders keep the active layer * visible, or show the compositing result. */ RenderResult *rr = RE_AcquireResultRead(rj->re); - if(RE_HasCombinedLayer(rr)) { + if (RE_HasCombinedLayer(rr)) { sima->iuser.layer = 0; } RE_ReleaseResult(rj->re); |