blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 760 Projects 19 Wiki Activity

Fix enum-conversion, old-style-declaration warnings 

Introduced in 8f3a401975
This commit is contained in:
Campbell Barton 2020-12-14 20:41:02 +11:00
parent 6327771bc9
commit 7d4536cacc
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenloader/intern/versioning_290.c
View File

@ -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);
}

5
source/blender/draw/engines/eevee/eevee_renderpasses.c
View File

@ -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;