blender
/
blender
136
405
Fork 586
Code Issues 6.2k Pull Requests 757 Projects 19 Wiki Activity

Cleanup: skip redundant steps when the selection buffer is cached 

The viewport theme loaded and virtual modifiers allocated unnecessary.
This commit is contained in:
Campbell Barton 2022-02-02 18:10:27 +11:00
parent da5e72eb01
commit e8b3bd15e8
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source/blender/editors/space_view3d/view3d_view.c
View File

@ -981,6 +981,15 @@ int view3d_opengl_select_ex(ViewContext *vc,
}
}
/* Re-use cache (rect must be smaller than the cached)
* other context is assumed to be unchanged */
if (GPU_select_is_cached()) {
GPU_select_begin(buffer, buffer_len, &rect, gpu_select_mode, 0);
GPU_select_cache_load_id();
hits = GPU_select_end();
goto finally;
}
/* Important to use 'vc->obact', not 'OBACT(vc->view_layer)' below,
* so it will be NULL when hidden. */
struct {
@ -1040,15 +1049,6 @@ int view3d_opengl_select_ex(ViewContext *vc,
UI_Theme_Store(&theme_state);
UI_SetTheme(SPACE_VIEW3D, RGN_TYPE_WINDOW);
/* Re-use cache (rect must be smaller than the cached)
* other context is assumed to be unchanged */
if (GPU_select_is_cached()) {
GPU_select_begin(buffer, buffer_len, &rect, gpu_select_mode, 0);
GPU_select_cache_load_id();
hits = GPU_select_end();
goto finally;
}
/* All of the queries need to be perform on the drawing context. */
DRW_opengl_context_enable();
@ -1132,14 +1132,14 @@ int view3d_opengl_select_ex(ViewContext *vc,
DRW_opengl_context_disable();
UI_Theme_Restore(&theme_state);
finally:
if (hits < 0) {
printf("Too many objects in select buffer\n"); /* XXX make error message */
}
UI_Theme_Restore(&theme_state);
return hits;
}