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

Merge branch 'blender-v5.0-release'

Browse Source
This commit is contained in:
Harley Acheson
2025-10-10 11:06:36 -07:00
parent 53cdcf3042 64b4db4a12
commit 78029fa777
4 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/draw/engines/eevee/shaders/eevee_geom_volume_vert.glsl
View File

@@ -28,4 +28,14 @@ void main()
interp.P = drw_point_object_to_world(lP);
gl_Position = reverse_z::transform(drw_point_world_to_homogenous(interp.P));
#ifdef MAT_SHADOW
/* Volumes currently do not support shadow. But the shader validation pipeline still compiles the
* shadow variant of this shader. Avoid linking error on Intel Windows drivers. */
# ifdef SHADOW_UPDATE_ATOMIC_RASTER
shadow_iface.shadow_view_id = 0;
# endif
shadow_clip.position = float3(0);
shadow_clip.vector = float3(0);
#endif
}

10
source/blender/draw/engines/eevee/shaders/eevee_geom_world_vert.glsl
View File

@@ -29,4 +29,14 @@ void main()
interp.N = float3(1);
gl_Position = reverse_z::transform(gl_Position);
#ifdef MAT_SHADOW
/* This shader currently does not support shadow. But the shader validation pipeline still
* compiles the shadow variant of this shader. Avoid linking error on Intel Windows drivers. */
# ifdef SHADOW_UPDATE_ATOMIC_RASTER
shadow_iface.shadow_view_id = 0;
# endif
shadow_clip.position = float3(0);
shadow_clip.vector = float3(0);
#endif
}

8
source/blender/editors/interface/regions/interface_region_tooltip.cc
View File

@@ -1509,10 +1509,10 @@ static ARegion *ui_tooltip_create_with_data(bContext *C,
init_rect.ymin = init_rect_overlap->ymin - pad;
init_rect.ymax = init_rect_overlap->ymax + pad;
rcti rect_clamp;
rect_clamp.xmin = 0;
rect_clamp.xmax = win_size[0];
rect_clamp.ymin = 0;
rect_clamp.ymax = win_size[1];
rect_clamp.xmin = pad_x + pad;
rect_clamp.xmax = win_size[0] - pad_x - pad;
rect_clamp.ymin = pad_y + pad;
rect_clamp.ymax = win_size[1] - pad_y - pad;
/* try right. */
const int size_x = BLI_rcti_size_x(&rect_i);
const int size_y = BLI_rcti_size_y(&rect_i);

5
source/blender/python/gpu/gpu_py_shader.cc
View File

@@ -1049,6 +1049,11 @@ PyDoc_STRVAR(
"All built-in shaders have the ``mat4 ModelViewProjectionMatrix`` uniform.\n"
"\n"
"Its value must be modified using the :class:`gpu.matrix` module.\n"
"\n"
".. important::\n"
"\n"
" Shader uniforms must be explicitly initialized to avoid retaining values from previous "
"executions.\n"
"\n" PYDOC_BUILTIN_SHADER_DESCRIPTION);
static PyModuleDef pygpu_shader_module_def = {
/*m_base*/ PyModuleDef_HEAD_INIT,