diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2018-01-29 21:39:07 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2018-01-30 00:00:15 +0300 |
| commit | 8cce33913162b44bfbfca523f30d546bf956fd52 (patch) | |
| tree | f41838c6767af522b2f5ee54a6f5061e277bbfa2 | |
| parent | ba9a4deddad599fbbbcfe7305b1937aa95f495bd (diff) | |
Eevee: Add new "render samples" properties.
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_render.py | 1 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_view_layer.py | 1 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_layer.c | 12 |
3 files changed, 12 insertions, 2 deletions
diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py index e9a41f33335..79bb8a9ddf2 100644 --- a/release/scripts/startup/bl_ui/properties_render.py +++ b/release/scripts/startup/bl_ui/properties_render.py @@ -850,6 +850,7 @@ class RENDER_PT_eevee_sampling(RenderButtonsPanel, Panel): col = layout.column() col.prop(props, "taa_samples") + col.prop(props, "taa_render_samples") class RENDER_PT_eevee_indirect_lighting(RenderButtonsPanel, Panel): diff --git a/release/scripts/startup/bl_ui/properties_view_layer.py b/release/scripts/startup/bl_ui/properties_view_layer.py index 9d3183f45e7..291b68b41d9 100644 --- a/release/scripts/startup/bl_ui/properties_view_layer.py +++ b/release/scripts/startup/bl_ui/properties_view_layer.py @@ -424,6 +424,7 @@ class VIEWLAYER_PT_eevee_sampling(ViewLayerButtonsPanel, Panel): col = layout.column() col.template_override_property(layer_props, scene_props, "taa_samples") + col.template_override_property(layer_props, scene_props, "taa_render_samples") class VIEWLAYER_PT_eevee_indirect_lighting(ViewLayerButtonsPanel, Panel): diff --git a/source/blender/makesrna/intern/rna_layer.c b/source/blender/makesrna/intern/rna_layer.c index 47f5d037d09..131378b5c49 100644 --- a/source/blender/makesrna/intern/rna_layer.c +++ b/source/blender/makesrna/intern/rna_layer.c @@ -384,6 +384,7 @@ 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_INT(taa_samples) +RNA_LAYER_ENGINE_EEVEE_GET_SET_INT(taa_render_samples) RNA_LAYER_ENGINE_EEVEE_GET_SET_INT(gi_diffuse_bounces) RNA_LAYER_ENGINE_EEVEE_GET_SET_INT(gi_cubemap_resolution) RNA_LAYER_ENGINE_EEVEE_GET_SET_INT(gi_visibility_resolution) @@ -1199,12 +1200,19 @@ static void rna_def_view_layer_engine_settings_eevee(BlenderRNA *brna) 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, "Viewport Samples", "Number of temporal samples, unlimited if 0, " - "disabled if 1"); + RNA_def_property_ui_text(prop, "Viewport Samples", "Number of samples, unlimited if 0"); 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_ViewLayerEngineSettings_update"); + prop = RNA_def_property(srna, "taa_render_samples", PROP_INT, PROP_NONE); + RNA_def_property_int_funcs(prop, "rna_LayerEngineSettings_Eevee_taa_render_samples_get", + "rna_LayerEngineSettings_Eevee_taa_render_samples_set", NULL); + RNA_def_property_ui_text(prop, "Render Samples", "Number of samples per pixels for rendering"); + RNA_def_property_range(prop, 1, INT_MAX); + RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); + RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_ViewLayerEngineSettings_update"); + /* Screen Space Subsurface Scattering */ prop = RNA_def_property(srna, "sss_enable", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_funcs(prop, "rna_LayerEngineSettings_Eevee_sss_enable_get", |