griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.3-release'

Browse Source
This commit is contained in:
Campbell Barton
2024-11-06 10:52:00 +11:00
parent f234525753 a1dfd51fae
commit 5f14c70a19
6 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenloader/intern/versioning_280.cc
View File

@@ -3441,7 +3441,7 @@ void blo_do_versions_280(FileData *fd, Library * /*lib*/, Main *bmain)
scene->eevee.volumetric_shadow_samples = 16;
scene->eevee.gtao_distance = 0.2f;
scene->eevee.gtao_quality = 0.25f;
scene->eevee.fast_gi_quality = 0.25f;
scene->eevee.bokeh_max_size = 100.0f;
scene->eevee.bokeh_threshold = 1.0f;
@@ -3550,7 +3550,7 @@ void blo_do_versions_280(FileData *fd, Library * /*lib*/, Main *bmain)
// EEVEE_GET_FLOAT(props, gtao_distance);
// EEVEE_GET_FLOAT(props, gtao_factor);
EEVEE_GET_FLOAT(props, gtao_quality);
EEVEE_GET_FLOAT(props, fast_gi_quality);
EEVEE_GET_FLOAT(props, bokeh_max_size);
EEVEE_GET_FLOAT(props, bokeh_threshold);

4
source/blender/draw/engines/eevee_next/eevee_ambient_occlusion.cc
View File

@@ -43,9 +43,9 @@ void AmbientOcclusion::init()
data_.distance = sce_eevee.gtao_distance;
data_.gi_distance = (sce_eevee.fast_gi_distance > 0.0f) ? sce_eevee.fast_gi_distance : 1e16f;
/* AO node uses its own number of samples. */
data_.lod_factor_ao = 1.0f / (1.0f + sce_eevee.gtao_quality * 4.0f);
data_.lod_factor_ao = 1.0f / (1.0f + sce_eevee.fast_gi_quality * 4.0f);
data_.lod_factor = (4.0f / sce_eevee.fast_gi_step_count) /
(1.0f + sce_eevee.gtao_quality * 4.0f);
(1.0f + sce_eevee.fast_gi_quality * 4.0f);
data_.angle_bias = 1.0 / max_ff(1e-8f, 1.0 - sce_eevee.gtao_focus);
data_.thickness_near = sce_eevee.fast_gi_thickness_near;
data_.thickness_far = sce_eevee.fast_gi_thickness_far;

2
source/blender/makesdna/DNA_scene_defaults.h
View File

@@ -195,13 +195,13 @@
.volumetric_shadow_samples = 16, \
\
.gtao_distance = 0.2f, \
.gtao_quality = 0.25f, \
.gtao_thickness = 0.5f, \
.gtao_focus = 0.05f, \
.gtao_resolution = 2, \
\
.fast_gi_step_count = 8, \
.fast_gi_ray_count = 2, \
.fast_gi_quality = 0.25f, \
.fast_gi_distance = 0.0f, \
.fast_gi_thickness_near = 0.25f, \
.fast_gi_thickness_far = DEG2RAD(45), \

2
source/blender/makesdna/DNA_scene_types.h
View File

@@ -1901,13 +1901,13 @@ typedef struct SceneEEVEE {
int volumetric_ray_depth;
float gtao_distance;
float gtao_quality;
float gtao_thickness;
float gtao_focus;
int gtao_resolution;
int fast_gi_step_count;
int fast_gi_ray_count;
float fast_gi_quality;
float fast_gi_distance;
float fast_gi_thickness_near;
float fast_gi_thickness_far;

1
source/blender/makesdna/intern/dna_rename_defs.h
View File

@@ -175,6 +175,7 @@ DNA_STRUCT_RENAME_MEMBER(RenderData, blurfac, motion_blur_shutter)
DNA_STRUCT_RENAME_MEMBER(RigidBodyWorld, steps_per_second, substeps_per_frame)
DNA_STRUCT_RENAME_MEMBER(SDefBind, numverts, verts_num)
DNA_STRUCT_RENAME_MEMBER(SDefVert, numbinds, binds_num)
DNA_STRUCT_RENAME_MEMBER(SceneEEVEE, gtao_quality, fast_gi_quality)
DNA_STRUCT_RENAME_MEMBER(SceneEEVEE, motion_blur_position, motion_blur_position_deprecated)
DNA_STRUCT_RENAME_MEMBER(SceneEEVEE, motion_blur_shutter, motion_blur_shutter_deprecated)
DNA_STRUCT_RENAME_MEMBER(SceneEEVEE, shadow_cube_size, shadow_cube_size_deprecated)

4
source/blender/makesrna/intern/rna_scene.cc
View File

@@ -8168,7 +8168,10 @@ static void rna_def_scene_eevee(BlenderRNA *brna)
RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_LIBRARY);
RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, nullptr);
/* TODO: remove this, kept for EEVEE 4.2 compatibility,
* this is a duplicate of "fast_gi_quality"). */
prop = RNA_def_property(srna, "gtao_quality", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_float_sdna(prop, nullptr, "fast_gi_quality");
RNA_def_property_ui_text(prop, "Trace Precision", "Precision of the horizon search");
RNA_def_property_range(prop, 0.0f, 1.0f);
RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_LIBRARY);
@@ -8215,7 +8218,6 @@ static void rna_def_scene_eevee(BlenderRNA *brna)
RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, nullptr);
prop = RNA_def_property(srna, "fast_gi_quality", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_float_sdna(prop, nullptr, "gtao_quality");
RNA_def_property_ui_text(prop, "Trace Precision", "Precision of the fast GI ray marching");
RNA_def_property_range(prop, 0.0f, 1.0f);
RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_LIBRARY);