diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2017-10-03 19:30:36 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2017-10-03 19:30:56 +0300 |
commit | 9422db7796e17bc23a9544d44f2a2e00a9b7e775 (patch) | |
tree | 1f0d3e870d9ef508d4818da107a3fc6d014cf72b /source/blender | |
parent | 57c323b5d3a8227a00f99395bf3779174efe5335 (diff) |
Eevee: Some changes to the Render / Render layers settings panel.
- Separate the Post Processes settings into sub panel.
- Rename "Viewport Anti-Aliasing" to sampling & super-sampling as it also reduce the noise of other effects.
- Remove Temporal Anti-Aliasing toggle and make it always active unless the number of samples is 1.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/draw/engines/eevee/eevee_effects.c | 2 | ||||
-rw-r--r-- | source/blender/draw/engines/eevee/eevee_engine.c | 1 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 17 |
3 files changed, 6 insertions, 14 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_effects.c b/source/blender/draw/engines/eevee/eevee_effects.c index d039f470000..8faa4fca937 100644 --- a/source/blender/draw/engines/eevee/eevee_effects.c +++ b/source/blender/draw/engines/eevee/eevee_effects.c @@ -510,7 +510,7 @@ void EEVEE_effects_init(EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata) } } - if (BKE_collection_engine_property_value_get_bool(props, "taa_enable")) { + if (BKE_collection_engine_property_value_get_int(props, "taa_samples") != 1) { float persmat[4][4], viewmat[4][4]; enabled_effects |= EFFECT_TAA | EFFECT_DOUBLE_BUFFER; diff --git a/source/blender/draw/engines/eevee/eevee_engine.c b/source/blender/draw/engines/eevee/eevee_engine.c index 4c92b031c1e..0014cf7bf1e 100644 --- a/source/blender/draw/engines/eevee/eevee_engine.c +++ b/source/blender/draw/engines/eevee/eevee_engine.c @@ -313,7 +313,6 @@ static void EEVEE_scene_layer_settings_create(RenderEngine *UNUSED(engine), IDPr BKE_collection_engine_property_add_int(props, "gi_diffuse_bounces", 3); - BKE_collection_engine_property_add_bool(props, "taa_enable", true); BKE_collection_engine_property_add_int(props, "taa_samples", 8); BKE_collection_engine_property_add_bool(props, "ssr_enable", false); diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 49ca2101e34..c7d122280b6 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -2572,7 +2572,6 @@ RNA_LAYER_ENGINE_EEVEE_GET_SET_FLOAT(ssr_firefly_fac) RNA_LAYER_ENGINE_EEVEE_GET_SET_INT(shadow_method) RNA_LAYER_ENGINE_EEVEE_GET_SET_INT(shadow_size) RNA_LAYER_ENGINE_EEVEE_GET_SET_BOOL(shadow_high_bitdepth) -RNA_LAYER_ENGINE_EEVEE_GET_SET_BOOL(taa_enable) RNA_LAYER_ENGINE_EEVEE_GET_SET_INT(taa_samples) RNA_LAYER_ENGINE_EEVEE_GET_SET_INT(gi_diffuse_bounces) @@ -6185,24 +6184,18 @@ static void rna_def_scene_layer_engine_settings_eevee(BlenderRNA *brna) prop = RNA_def_property(srna, "gi_diffuse_bounces", PROP_INT, PROP_NONE); RNA_def_property_int_funcs(prop, "rna_LayerEngineSettings_Eevee_gi_diffuse_bounces_get", "rna_LayerEngineSettings_Eevee_gi_diffuse_bounces_set", NULL); - RNA_def_property_ui_text(prop, "Bounces", "Number of time the light is reinjected inside light grids, " - "0 disable indirect diffuse light"); + RNA_def_property_ui_text(prop, "Diffuse Bounces", "Number of time the light is reinjected inside light grids, " + "0 disable indirect diffuse light"); RNA_def_property_range(prop, 0, INT_MAX); RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_SceneLayerEngineSettings_update"); - /* Temporal Anti-Aliasing */ - prop = RNA_def_property(srna, "taa_enable", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_funcs(prop, "rna_LayerEngineSettings_Eevee_taa_enable_get", - "rna_LayerEngineSettings_Eevee_taa_enable_set"); - RNA_def_property_ui_text(prop, "Temporal Anti-Aliasing", "Enable temporal anti-aliasing (only used by viewport)"); - RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); - RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_SceneLayerEngineSettings_update"); - + /* Temporal Anti-Aliasing (super sampling) */ prop = RNA_def_property(srna, "taa_samples", PROP_INT, PROP_NONE); RNA_def_property_int_funcs(prop, "rna_LayerEngineSettings_Eevee_taa_samples_get", "rna_LayerEngineSettings_Eevee_taa_samples_set", NULL); - RNA_def_property_ui_text(prop, "Samples", "Minimum number of temporal samples, unlimited if 0"); + RNA_def_property_ui_text(prop, "Viewport Samples", "Number of temporal samples, unlimited if 0, " + "disabled if 1"); RNA_def_property_range(prop, 0, INT_MAX); RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_SceneLayerEngineSettings_update"); |