diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2018-02-01 20:54:17 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2018-02-01 22:48:30 +0300 |
commit | ab5f86a04e1cbc7105ae50836abb74524516e976 (patch) | |
tree | 43743c5d9e1b8a2f53d1b4ffca1687c50522e5ec /source/blender | |
parent | e52c5bcdb56886a10a8aa432c240f2f74dc7c0a5 (diff) |
Eevee: Render: Add Transparent Background option.
... under a new "Film" tab in the render properties panel.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/draw/engines/eevee/eevee_render.c | 4 | ||||
-rw-r--r-- | source/blender/draw/intern/draw_manager.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_render.c b/source/blender/draw/engines/eevee/eevee_render.c index b4a0986b56c..92ea737906c 100644 --- a/source/blender/draw/engines/eevee/eevee_render.c +++ b/source/blender/draw/engines/eevee/eevee_render.c @@ -75,7 +75,7 @@ void EEVEE_render_init(EEVEE_Data *ved, RenderEngine *engine, struct Depsgraph * stl->g_data = MEM_callocN(sizeof(*stl->g_data), __func__); } EEVEE_PrivateData *g_data = stl->g_data; - g_data->background_alpha = 1.0f; /* TODO option */ + g_data->background_alpha = DRW_state_draw_background() ? 1.0f : 0.0f; g_data->valid_double_buffer = 0; /* Alloc common ubo data. */ @@ -348,7 +348,7 @@ void EEVEE_render_draw(EEVEE_Data *vedata, struct RenderEngine *engine, struct D unsigned int render_samples = BKE_collection_engine_property_value_get_int(props, "taa_render_samples"); while (render_samples-- > 0) { - float clear_col[4] = {0.0f, 0.0f, 0.0f, 0.6f}; + float clear_col[4] = {0.0f, 0.0f, 0.0f, 0.0f}; unsigned int primes[3] = {2, 3, 7}; double offset[3] = {0.0, 0.0, 0.0}; double r[3]; diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index 0e8861b48bb..baa2f46a87a 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -3607,6 +3607,7 @@ void DRW_render_to_image(RenderEngine *re, struct Depsgraph *depsgraph) /* Reset before using it. */ memset(&DST, 0x0, sizeof(DST)); DST.options.is_image_render = true; + DST.options.draw_background = scene->r.alphamode == R_ADDSKY; DST.draw_ctx = (DRWContextState){ NULL, NULL, NULL, scene, view_layer, OBACT(view_layer), engine_type, depsgraph, NULL |