blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

DrawManager: Bounding Box Drawing 

Fix for T72136: Bounding boxes were still drawn even with disabled
overlays. Also the outline displayed the original mesh

Reviewed By: fclem

Differential Revision: https://developer.blender.org/D6350
This commit is contained in:
Jeroen Bakker 2019-12-03 09:13:17 +01:00
parent c7e64f67ed
commit d6fe8cea73
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/draw/engines/overlay/overlay_engine.c
View File

@ -336,7 +336,9 @@ static void OVERLAY_cache_populate(void *vedata, Object *ob)
}
/* Relationship, object center, bounbox ... */
OVERLAY_extra_cache_populate(vedata, ob);
if (!pd->hide_overlays) {
OVERLAY_extra_cache_populate(vedata, ob);
}
if (dupli) {
dupli->base_flag = ob->base_flag;

6
source/blender/draw/engines/overlay/overlay_outline.c
View File

@ -271,6 +271,12 @@ void OVERLAY_outline_cache_populate(OVERLAY_Data *vedata,
const DRWContextState *draw_ctx = DRW_context_state_get();
struct GPUBatch *geom;
DRWShadingGroup *shgroup = NULL;
const bool draw_outline = ob->dt > OB_BOUNDBOX;
/* Early exit: outlines of bounding boxes are not drawn. */
if (!draw_outline) {
return;
}
if (ob->type == OB_LIGHTPROBE) {
outline_lightprobe(pd, ob, draw_ctx->view_layer);