blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

ObjectMode: Fix instances with BoundBox drawtype not displaying

This commit is contained in:
Clément Foucault 2018-10-17 18:08:00 +02:00
parent e5b18390fa
commit 91e5e02aff
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/draw/modes/object_mode.c
View File

@ -2802,6 +2802,13 @@ static void OBJECT_cache_populate(void *vedata, Object *ob)
DRW_shgroup_forcefield(sgl, ob, view_layer);
}
if (ob->dt == OB_BOUNDBOX) {
if (theme_id == TH_UNDEFINED) {
theme_id = DRW_object_wire_theme_get(ob, view_layer, NULL);
}
DRW_shgroup_bounds(sgl, ob, theme_id);
}
/* don't show object extras in set's */
if ((ob->base_flag & (BASE_FROM_SET | BASE_FROMDUPLI)) == 0) {
if ((draw_ctx->object_mode & (OB_MODE_ALL_PAINT | OB_MODE_ALL_PAINT_GPENCIL)) == 0) {
@ -2812,7 +2819,7 @@ static void OBJECT_cache_populate(void *vedata, Object *ob)
DRW_shgroup_relationship_lines(sgl, draw_ctx->depsgraph, scene, ob);
}
const bool draw_extra = (ob->dtx != 0 || ob->dt == OB_BOUNDBOX);
const bool draw_extra = (ob->dtx != 0);
if (draw_extra && (theme_id == TH_UNDEFINED)) {
theme_id = DRW_object_wire_theme_get(ob, view_layer, NULL);
}
@ -2833,7 +2840,8 @@ static void OBJECT_cache_populate(void *vedata, Object *ob)
DRW_shgroup_texture_space(sgl, ob, theme_id);
}
if (ob->dtx & OB_DRAWBOUNDOX || ob->dt == OB_BOUNDBOX) {
/* Don't draw bounding box again if draw type is bound box. */
if (ob->dtx & OB_DRAWBOUNDOX && ob->dt != OB_BOUNDBOX) {
DRW_shgroup_bounds(sgl, ob, theme_id);
}