diff options
author | Jeroen Bakker <jeroen@blender.org> | 2021-05-10 14:34:05 +0300 |
---|---|---|
committer | Jeroen Bakker <jeroen@blender.org> | 2021-05-10 14:34:05 +0300 |
commit | cacfa75e67cf2673f445b698c401f647402b9e46 (patch) | |
tree | fd78632b191377309f0093b5f1e84afe2e617a24 /source/blender/draw | |
parent | bc868f7b52786a80abb769dc2c34e6a27192743f (diff) | |
parent | 6cd4bb94350a9395da143fe90d9e600c0196025a (diff) |
Merge branch 'blender-v2.93-release'
Diffstat (limited to 'source/blender/draw')
-rw-r--r-- | source/blender/draw/engines/eevee/eevee_cryptomatte.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_cryptomatte.c b/source/blender/draw/engines/eevee/eevee_cryptomatte.c index 0cb2d55d1eb..eace4eb18f6 100644 --- a/source/blender/draw/engines/eevee/eevee_cryptomatte.c +++ b/source/blender/draw/engines/eevee/eevee_cryptomatte.c @@ -121,7 +121,7 @@ void EEVEE_cryptomatte_renderpasses_init(EEVEE_Data *vedata) ViewLayer *view_layer = draw_ctx->view_layer; /* Cryptomatte is only rendered for final image renders */ - if (!DRW_state_is_image_render()) { + if (!DRW_state_is_scene_render()) { return; } const eViewLayerCryptomatteFlags active_layers = eevee_cryptomatte_active_layers(view_layer); @@ -158,9 +158,9 @@ void EEVEE_cryptomatte_output_init(EEVEE_ViewLayerData *UNUSED(sldata), const ViewLayer *view_layer = draw_ctx->view_layer; const int num_cryptomatte_layers = eevee_cryptomatte_layers_count(view_layer); - eGPUTextureFormat format = (num_cryptomatte_layers == 1) ? - GPU_R32F : - (num_cryptomatte_layers == 2) ? GPU_RG32F : GPU_RGBA32F; + eGPUTextureFormat format = (num_cryptomatte_layers == 1) ? GPU_R32F : + (num_cryptomatte_layers == 2) ? GPU_RG32F : + GPU_RGBA32F; const float *viewport_size = DRW_viewport_size_get(); const int buffer_size = viewport_size[0] * viewport_size[1]; |