archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T52190: Depth picking fails

Browse Source
This commit is contained in:
Campbell Barton
2017-07-26 02:34:14 +10:00
parent 80e03e7709
commit 2b1cd24c6e
2 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
source/blender/draw/engines/basic/basic_engine.c
View File

@@ -206,21 +206,42 @@ static void BASIC_draw_scene(void *vedata)
BASIC_PassList *psl = ((BASIC_Data *)vedata)->psl;
BASIC_FramebufferList *fbl = ((BASIC_Data *)vedata)->fbl;
DefaultFramebufferList *dfbl = DRW_viewport_framebuffer_list_get();
const bool is_select = DRW_state_is_select();
bool use_color = true;
bool use_depth = true;
bool use_depth_cull = true;
if (is_select) {
/* Needed for depth-picking,
* for other selection types there are no need for extra passes either. */
use_color = false;
use_depth_cull = false;
}
#ifdef USE_DEPTH
/* Pass 1 : Depth pre-pass */
DRW_draw_pass(psl->depth_pass);
DRW_draw_pass(psl->depth_pass_cull);
if (use_depth) {
DRW_draw_pass(psl->depth_pass);
}
if (use_depth_cull) {
DRW_draw_pass(psl->depth_pass_cull);
}
/* Pass 2 : Duplicate depth */
/* Unless we go for deferred shading we need this to avoid manual depth test and artifacts */
if (DRW_state_is_fbo()) {
DRW_framebuffer_blit(dfbl->default_fb, fbl->dupli_depth, true);
if (use_depth || use_depth_cull) {
/* Unless we go for deferred shading we need this to avoid manual depth test and artifacts */
if (DRW_state_is_fbo()) {
DRW_framebuffer_blit(dfbl->default_fb, fbl->dupli_depth, true);
}
}
#endif
/* Pass 3 : Shading */
DRW_draw_pass(psl->color_pass);
if (use_color) {
DRW_draw_pass(psl->color_pass);
}
}
static void BASIC_engine_free(void)

2
source/blender/gpu/intern/gpu_select.c
View File

@@ -252,4 +252,4 @@ const uint *GPU_select_buffer_near(const uint *buffer, int hits)
buffer += 4;
}
return buffer_near;
}
}