[Bf-blender-cvs] [2ab62722331] blender2.8: DRW: Fix assert with BoundBox object display mode

Clément Foucault noreply at git.blender.org
Tue Oct 16 23:03:25 CEST 2018


Commit: 2ab62722331b5e73c1af8e729d798c5e1bb7b436
Author: Clément Foucault
Date:   Tue Oct 16 22:52:00 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB2ab62722331b5e73c1af8e729d798c5e1bb7b436

DRW: Fix assert with BoundBox object display mode

===================================================================

M	source/blender/draw/modes/object_mode.c

===================================================================

diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c
index 20abfbf3348..222a5977665 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -2812,7 +2812,8 @@ static void OBJECT_cache_populate(void *vedata, Object *ob)
 			DRW_shgroup_relationship_lines(sgl, draw_ctx->depsgraph, scene, ob);
 		}
 
-		if ((ob->dtx != 0) && theme_id == TH_UNDEFINED) {
+		const bool draw_extra = (ob->dtx != 0 || ob->dt == OB_BOUNDBOX);
+		if (draw_extra && (theme_id == TH_UNDEFINED)) {
 			theme_id = DRW_object_wire_theme_get(ob, view_layer, NULL);
 		}



More information about the Bf-blender-cvs mailing list