Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClément Foucault <foucault.clem@gmail.com>2017-11-01 03:03:36 +0300
committerClément Foucault <foucault.clem@gmail.com>2017-11-01 03:17:35 +0300
commit345ffe3e4d9f9a37e95f65afb02510fb2cca428a (patch)
treea7c44906515adfa085bf8fc0b253d03455c6fbe0 /source/blender/draw/engines/eevee/eevee_materials.c
parentd836adb2757d61a26687d1d89f83dcf9dea88e98 (diff)
Eevee: Effects: Split each effect in it's own file.
This also: - make sure to only compile the shader needed by the active effects. - same thing for the shading groups. - disable TAA if motion blur is active (avoid infinite refresh).
Diffstat (limited to 'source/blender/draw/engines/eevee/eevee_materials.c')
-rw-r--r--source/blender/draw/engines/eevee/eevee_materials.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_materials.c b/source/blender/draw/engines/eevee/eevee_materials.c
index 1d551796a60..ddbe51ee3e8 100644
--- a/source/blender/draw/engines/eevee/eevee_materials.c
+++ b/source/blender/draw/engines/eevee/eevee_materials.c
@@ -359,7 +359,6 @@ static void add_standard_uniforms(
DRW_shgroup_uniform_bool(shgrp, "specToggle", &sldata->probes->specular_toggle, 1);
DRW_shgroup_uniform_bool(shgrp, "ssrToggle", &sldata->probes->ssr_toggle, 1);
DRW_shgroup_uniform_float(shgrp, "lodCubeMax", &sldata->probes->lod_cube_max, 1);
- DRW_shgroup_uniform_float(shgrp, "lodPlanarMax", &sldata->probes->lod_planar_max, 1);
DRW_shgroup_uniform_texture(shgrp, "utilTex", e_data.util_tex);
DRW_shgroup_uniform_buffer(shgrp, "probeCubes", &sldata->probe_pool);
DRW_shgroup_uniform_buffer(shgrp, "probePlanars", &vedata->txl->planar_pool);
@@ -1284,7 +1283,7 @@ void EEVEE_materials_cache_populate(EEVEE_Data *vedata, EEVEE_SceneLayerData *sl
/* Volumetrics */
if (vedata->stl->effects->use_volumetrics && use_volume_material) {
- EEVEE_effects_cache_volume_object_add(sldata, vedata, scene, ob);
+ EEVEE_volumes_cache_object_add(sldata, vedata, scene, ob);
}
}