blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 753 Projects 19 Wiki Activity

Revert "Fix Crash: Switching to wireframe mode." 

This reverts commit cb986446e2.
This commit is contained in:
Campbell Barton 2022-03-07 19:55:33 +11:00
parent ad2948face
commit 25fc5876d3
Notes: blender-bot 2023-02-14 04:20:36 +01:00 
Referenced by commit 548eabbaa1, Revert "Revert "Fix Crash: Switching to wireframe mode.""
Referenced by issue #93599, Smooth Drag Threshold for Tweak Events
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c
View File

@ -580,14 +580,6 @@ static int gizmo_find_intersected_3d_intern(wmGizmo **visible_gizmos,
/* Fast-path (occlusion queries). */
GPU_SELECT_ALL);
/* When switching between modes and the mouse pointer is over a gizmo, the highlight test is
* performed before the viewport is fully initialized (region->draw_buffer = NULL).
* When this is the case we should not use depth testing. */
GPUViewport *gpu_viewport = WM_draw_region_get_viewport(region);
if (use_depth_test && gpu_viewport == NULL) {
return -1;
}
if (GPU_select_is_cached()) {
GPU_select_begin(buffer, ARRAY_SIZE(buffer), &rect, gpu_select_mode, 0);
GPU_select_cache_load_id();
@ -605,7 +597,8 @@ static int gizmo_find_intersected_3d_intern(wmGizmo **visible_gizmos,
* because all future passes the will use the cached depths. */
GPUFrameBuffer *depth_read_fb = NULL;
if (use_depth_test) {
GPUTexture *depth_tx = GPU_viewport_depth_texture(gpu_viewport);
GPUViewport *viewport = WM_draw_region_get_viewport(CTX_wm_region(C));
GPUTexture *depth_tx = GPU_viewport_depth_texture(viewport);
GPU_framebuffer_ensure_config(&depth_read_fb,
{
GPU_ATTACHMENT_TEXTURE(depth_tx),