blender
/
blender
128
396
Fork 568
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

Eevee: Fixups. 

Fix float promotion and missing layer parameters.
This commit is contained in:
Clément Foucault 2017-07-05 19:15:32 +02:00
parent f6c739cbcd
commit c62f82e35b
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
release/scripts/startup/bl_ui/properties_render_layer.py
View File

@ -239,7 +239,15 @@ class RENDERLAYER_PT_eevee_volumetric(RenderLayerButtonsPanel, Panel):
layer_props = layer.engine_overrides['BLENDER_EEVEE']
col = layout.column()
# to be completed
col.prop(props, "volumetric_start")
col.prop(props, "volumetric_end")
col.prop(props, "volumetric_samples")
col.prop(props, "volumetric_sample_distribution")
col.prop(props, "volumetric_lights")
col.prop(props, "volumetric_light_clamp")
col.prop(props, "volumetric_shadows")
col.prop(props, "volumetric_shadow_samples")
col.prop(props, "volumetric_colored_transmittance")
classes = (

6
source/blender/draw/engines/eevee/eevee_engine.c
View File

@ -191,10 +191,10 @@ static void EEVEE_scene_layer_settings_create(RenderEngine *UNUSED(engine), IDPr
props->subtype == IDP_GROUP_SUB_ENGINE_RENDER);
BKE_collection_engine_property_add_bool(props, "volumetric_enable", false);
BKE_collection_engine_property_add_float(props, "volumetric_start", 0.1);
BKE_collection_engine_property_add_float(props, "volumetric_end", 100.0);
BKE_collection_engine_property_add_float(props, "volumetric_start", 0.1f);
BKE_collection_engine_property_add_float(props, "volumetric_end", 100.0f);
BKE_collection_engine_property_add_int(props, "volumetric_samples", 64);
BKE_collection_engine_property_add_float(props, "volumetric_sample_distribution", 0.8);
BKE_collection_engine_property_add_float(props, "volumetric_sample_distribution", 0.8f);
BKE_collection_engine_property_add_bool(props, "volumetric_lights", true);
BKE_collection_engine_property_add_float(props, "volumetric_light_clamp", 0.0f);
BKE_collection_engine_property_add_bool(props, "volumetric_shadows", false);

2
source/blender/makesrna/intern/rna_scene.c
View File

@ -6273,7 +6273,7 @@ static void rna_def_scene_layer_engine_settings_eevee(BlenderRNA *brna)
RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Eevee_gtao_factor_get", "rna_LayerEngineSettings_Eevee_gtao_factor_set", NULL);
RNA_def_property_ui_text(prop, "Factor", "Factor for ambient occlusion blending");
RNA_def_property_range(prop, 0, FLT_MAX);
RNA_def_property_ui_range(prop, 0.0, 1.0, 0.1, 2);
RNA_def_property_ui_range(prop, 0.0f, 1.0f, 0.1f, 2);
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_LayerCollectionEngineSettings_update");