diff options
| m--------- | release/scripts/addons | 0 | ||||
| m--------- | release/scripts/addons_contrib | 0 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/scene.c | 6 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/versioning_280.c | 6 | ||||
| -rw-r--r-- | source/blender/draw/engines/eevee/shaders/effect_bloom_frag.glsl | 8 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 14 |
6 files changed, 18 insertions, 16 deletions
diff --git a/release/scripts/addons b/release/scripts/addons -Subproject 4fd7be071b037562c23cf4711abd54dffb667fd +Subproject 5f7fba0565a7c9ae93eae31a08fc9bbbd16d333 diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib -Subproject 272b1a4ef07717beb3d0bfcb7380c2164fd008a +Subproject fecc0db5600405a0c14c70120ae279222861ef8 diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 1bae41ce035..f266a839c52 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -929,12 +929,12 @@ void BKE_scene_init(Scene *sce) copy_v3_fl(sce->eevee.bloom_color, 1.0f); sce->eevee.bloom_threshold = 0.8f; sce->eevee.bloom_knee = 0.5f; - sce->eevee.bloom_intensity = 0.8f; + sce->eevee.bloom_intensity = 0.05f; sce->eevee.bloom_radius = 6.5f; - sce->eevee.bloom_clamp = 1.0f; + sce->eevee.bloom_clamp = 0.0f; sce->eevee.motion_blur_samples = 8; - sce->eevee.motion_blur_shutter = 1.0f; + sce->eevee.motion_blur_shutter = 0.5f; sce->eevee.shadow_method = SHADOW_ESM; sce->eevee.shadow_cube_size = 512; diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index bd21ade9413..8a75ec17567 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -1420,12 +1420,12 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) copy_v3_fl(scene->eevee.bloom_color, 1.0f); scene->eevee.bloom_threshold = 0.8f; scene->eevee.bloom_knee = 0.5f; - scene->eevee.bloom_intensity = 0.8f; + scene->eevee.bloom_intensity = 0.05f; scene->eevee.bloom_radius = 6.5f; - scene->eevee.bloom_clamp = 1.0f; + scene->eevee.bloom_clamp = 0.0f; scene->eevee.motion_blur_samples = 8; - scene->eevee.motion_blur_shutter = 1.0f; + scene->eevee.motion_blur_shutter = 0.5f; scene->eevee.shadow_method = SHADOW_ESM; scene->eevee.shadow_cube_size = 512; diff --git a/source/blender/draw/engines/eevee/shaders/effect_bloom_frag.glsl b/source/blender/draw/engines/eevee/shaders/effect_bloom_frag.glsl index c3674c8f74c..f06a17a8e44 100644 --- a/source/blender/draw/engines/eevee/shaders/effect_bloom_frag.glsl +++ b/source/blender/draw/engines/eevee/shaders/effect_bloom_frag.glsl @@ -164,9 +164,11 @@ vec4 step_blit(void) /* Combine and apply the brightness response curve. */ m *= max(rq, br - curveThreshold.w) / max(1e-5, br); - /* Clamp pixel intensity */ - br = max(1e-5, brightness(m)); - m *= 1.0 - max(0.0, br - clampIntensity) / br; + /* Clamp pixel intensity if clamping enabled */ + if (clampIntensity > 0.0) { + br = max(1e-5, brightness(m)); + m *= 1.0 - max(0.0, br - clampIntensity) / br; + } return vec4(m, 1.0); } diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 114672017b7..74b2a6e6506 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -6176,17 +6176,17 @@ static void rna_def_scene_eevee(BlenderRNA *brna) RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_STATIC); prop = RNA_def_property(srna, "bloom_clamp", PROP_FLOAT, PROP_FACTOR); - RNA_def_property_float_default(prop, 1.0f); - RNA_def_property_ui_text(prop, "Clamp", "Maximum intensity a bloom pixel can have"); - RNA_def_property_range(prop, 0.0f, 1000.0f); - RNA_def_property_ui_range(prop, 0.0f, 10.0f, 1, 3); + RNA_def_property_float_default(prop, 0.0f); + RNA_def_property_ui_text(prop, "Clamp", "Maximum intensity a bloom pixel can have (0 to disabled)"); + RNA_def_property_range(prop, 0.0f, 100000.0f); + RNA_def_property_ui_range(prop, 0.0f, 1000.0f, 1, 3); RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_STATIC); - prop = RNA_def_property(srna, "bloom_intensity", PROP_FLOAT, PROP_UNSIGNED); - RNA_def_property_float_default(prop, 0.8f); + prop = RNA_def_property(srna, "bloom_intensity", PROP_FLOAT, PROP_FACTOR); + RNA_def_property_float_default(prop, 0.05f); RNA_def_property_ui_text(prop, "Intensity", "Blend factor"); RNA_def_property_range(prop, 0.0f, 10000.0f); - RNA_def_property_ui_range(prop, 0.0f, 10.0f, 1, 3); + RNA_def_property_ui_range(prop, 0.0f, 0.1f, 1, 3); RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_STATIC); /* Motion blur */ |