[Bf-blender-cvs] [5c3fa5a4247] master: Cleanup: correct enum type

Campbell Barton noreply at git.blender.org
Mon Dec 7 04:21:13 CET 2020


Commit: 5c3fa5a42474f0a831bcdef03a60f6a84594ccd9
Author: Campbell Barton
Date:   Mon Dec 7 13:24:51 2020 +1100
Branches: master
https://developer.blender.org/rB5c3fa5a42474f0a831bcdef03a60f6a84594ccd9

Cleanup: correct enum type

===================================================================

M	source/blender/draw/engines/eevee/eevee_cryptomatte.c

===================================================================

diff --git a/source/blender/draw/engines/eevee/eevee_cryptomatte.c b/source/blender/draw/engines/eevee/eevee_cryptomatte.c
index 7bf7955eeb4..3d13871946b 100644
--- a/source/blender/draw/engines/eevee/eevee_cryptomatte.c
+++ b/source/blender/draw/engines/eevee/eevee_cryptomatte.c
@@ -144,9 +144,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);
-  eGPUDataFormat 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];
 
@@ -651,4 +651,4 @@ void EEVEE_cryptomatte_free(EEVEE_Data *vedata)
   EEVEE_PrivateData *g_data = vedata->stl->g_data;
   MEM_SAFE_FREE(g_data->cryptomatte_accum_buffer);
   MEM_SAFE_FREE(g_data->cryptomatte_download_buffer);
-}
\ No newline at end of file
+}



More information about the Bf-blender-cvs mailing list