From 7d4536cacc82247da3b1c34eaea13986e151dd4b Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 14 Dec 2020 20:41:02 +1100 Subject: Fix enum-conversion, old-style-declaration warnings Introduced in 8f3a401975987c9b70f3ea0ea21977c70371b466 --- source/blender/blenloader/intern/versioning_290.c | 2 +- source/blender/draw/engines/eevee/eevee_renderpasses.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'source/blender') diff --git a/source/blender/blenloader/intern/versioning_290.c b/source/blender/blenloader/intern/versioning_290.c index fe22558eb06..4e642258899 100644 --- a/source/blender/blenloader/intern/versioning_290.c +++ b/source/blender/blenloader/intern/versioning_290.c @@ -1271,7 +1271,7 @@ void blo_do_versions_290(FileData *fd, Library *UNUSED(lib), Main *bmain) LISTBASE_FOREACH (bNode *, node, &scene->nodetree->nodes) { if (node->type == CMP_NODE_R_LAYERS) { LISTBASE_FOREACH (bNodeSocket *, output_socket, &node->outputs) { - const static char *volume_scatter = "VolumeScatterCol"; + const char *volume_scatter = "VolumeScatterCol"; if (STREQLEN(output_socket->name, volume_scatter, MAX_NAME)) { BLI_strncpy(output_socket->name, RE_PASSNAME_VOLUME_LIGHT, MAX_NAME); } diff --git a/source/blender/draw/engines/eevee/eevee_renderpasses.c b/source/blender/draw/engines/eevee/eevee_renderpasses.c index 6f87ff302f4..dff3b437953 100644 --- a/source/blender/draw/engines/eevee/eevee_renderpasses.c +++ b/source/blender/draw/engines/eevee/eevee_renderpasses.c @@ -283,9 +283,8 @@ void EEVEE_renderpasses_postprocess(EEVEE_ViewLayerData *UNUSED(sldata), g_data->renderpass_type = renderpass_type; g_data->renderpass_postprocess = PASS_POST_UNDEFINED; const bool volumetric_active = eevee_renderpasses_volumetric_active(effects, g_data); - eViewLayerEEVEEPassType default_color_pass_type = volumetric_active ? - PASS_POST_ACCUMULATED_TRANSMITTANCE_COLOR : - PASS_POST_ACCUMULATED_COLOR; + eRenderPassPostProcessType default_color_pass_type = + volumetric_active ? PASS_POST_ACCUMULATED_TRANSMITTANCE_COLOR : PASS_POST_ACCUMULATED_COLOR; g_data->renderpass_transmittance_input = volumetric_active ? txl->volume_transmittance_accum : txl->color; -- cgit v1.2.3