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

Merge branch 'blender-v4.2-release'

Browse Source
This commit is contained in:
Harley Acheson
2024-07-04 11:19:14 -07:00
parent 6e74fb9b69 26ea1f42c3
commit 6fbb5ce8d8
4 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -794,7 +794,7 @@ Enable multi-threading. TBB is also required for features such as Cycles, OpenVD
)
# TBB malloc is only supported on for windows currently
if(WIN32)
if(WIN32 AND NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "ARM64")
option(WITH_TBB_MALLOC_PROXY "Enable the TBB malloc replacement" ON)
endif()

3
scripts/startup/bl_ui/space_dopesheet.py
View File

@@ -533,6 +533,9 @@ class DOPESHEET_MT_channel(Menu):
layout.separator()
layout.operator("anim.channels_fcurves_enable")
layout.separator()
layout.operator("anim.channels_bake")
layout.separator()
layout.operator("anim.channels_view_selected")

5
source/blender/blenkernel/intern/vfontdata_freetype.cc
View File

@@ -93,7 +93,10 @@ VChar *BKE_vfontdata_char_from_freetypefont(VFont *vfont, ulong character)
}
if (font_id == -1) {
return nullptr;
/* This could happen for a saved file with an unpacked local font that was
* later removed. Load the default UI font so we can still show _something_. */
font_id = BLF_load_mem(
vfont->data->name, static_cast<const uchar *>(builtin_font_data), builtin_font_size);
}
VChar *che = (VChar *)MEM_callocN(sizeof(VChar), "objfnt_char");

44
source/blender/draw/engines/eevee_next/shaders/eevee_shadow_tracing_lib.glsl
View File

@@ -73,7 +73,7 @@ struct ShadowTracingSample {
\
ShadowTracingSample samp = shadow_map_trace_sample(state, ray); \
\
shadow_map_trace_hit_check(state, samp); \
shadow_map_trace_hit_check(state, samp, i == sample_count); \
} \
return state.hit; \
}
@@ -84,25 +84,22 @@ struct ShadowTracingSample {
* This reverse tracing allows to approximate the geometry behind occluders while minimizing
* light-leaks.
*/
void shadow_map_trace_hit_check(inout ShadowMapTracingState state, ShadowTracingSample samp)
void shadow_map_trace_hit_check(inout ShadowMapTracingState state,
ShadowTracingSample samp,
bool is_last_sample)
{
/* Skip empty tiles since they do not contain actual depth information.
* Not doing so would change the z gradient history. */
if (samp.skip_sample) {
return;
}
/* For the first sample, regular depth compare since we do not have history values. */
if (state.occluder_history.x == SHADOW_TRACING_INVALID_HISTORY) {
if (samp.occluder.x > state.ray_time) {
state.hit = true;
return;
}
state.occluder_history = samp.occluder;
return;
}
bool is_behind_occluder = samp.occluder.y > 1e-6;
bool is_behind_occluder = samp.occluder.y > 0.0;
if (is_behind_occluder && (state.occluder_slope != SHADOW_TRACING_INVALID_HISTORY)) {
if (samp.skip_sample) {
/* Skip empty tiles since they do not contain actual depth information.
* Not doing so would change the z gradient history. */
}
else if (state.occluder_history.x == SHADOW_TRACING_INVALID_HISTORY) {
/* First sample, regular depth compare since we do not have history values. */
state.hit = is_behind_occluder || (is_last_sample && (samp.occluder.x > state.ray_time));
state.occluder_history = samp.occluder;
}
else if (is_behind_occluder && (state.occluder_slope != SHADOW_TRACING_INVALID_HISTORY)) {
/* Extrapolate last known valid occluder and check if it crossed the ray.
* Note that we only want to check if the extrapolated occluder is above the ray at a certain
* time value, we don't actually care about the correct value. So we replace the complex
@@ -111,6 +108,8 @@ void shadow_map_trace_hit_check(inout ShadowMapTracingState state, ShadowTracing
float delta_time = state.ray_time - state.occluder_history.x;
float extrapolated_occluder_y = abs(state.occluder_history.y) +
state.occluder_slope * delta_time;
/* NOTE: We use the absolute of the function to account for all occluders configurations.
* The test just checks if it doesn't extrapolate in the other Y region. */
state.hit = extrapolated_occluder_y < 0.0;
}
else {
@@ -122,7 +121,7 @@ void shadow_map_trace_hit_check(inout ShadowMapTracingState state, ShadowTracing
state.occluder_slope = max(min_slope, abs(delta.y / delta.x));
state.occluder_history = samp.occluder;
/* Intersection test. Intersect if above the ray time. */
state.hit = samp.occluder.x > state.ray_time;
state.hit = is_behind_occluder || (is_last_sample && (samp.occluder.x > state.ray_time));
}
}
@@ -266,12 +265,13 @@ ShadowRayPunctual shadow_ray_generate_punctual(LightData light, vec2 random_2d,
direction = point_on_light_shape - lP;
direction = shadow_ray_above_horizon_ensure(direction, lNg, shape_radius);
}
vec3 shadow_position = light_local_data_get(light).shadow_position;
/* Clip the ray to not cross the near plane.
* Avoid traces that starts on tiles that have not been queried, creating noise. */
float clip_distance = clip_near + shape_radius * 0.5;
direction *= saturate(1.0 - clip_distance * inversesqrt(length_squared(direction)));
float clip_distance = length(lP - shadow_position) - clip_near;
/* Still clamp to a minimal size to avoid isssue with zero length vectors. */
direction *= saturate(1e-6 + clip_distance * inversesqrt(length_squared(direction)));
vec3 shadow_position = light_local_data_get(light).shadow_position;
/* Compute the ray again. */
ShadowRayPunctual ray;
/* Transform to shadow local space. */