[Bf-blender-cvs] [9f4ec02bb40] master: View3D: Fix object without bounds displaying bounding boxes

[Clément Foucault]

Commit: 9f4ec02bb4060c915bd407a3372d1240e4ed85f5
Author: Clément Foucault
Date:   Mon Mar 11 14:16:51 2019 +0100
Branches: master
https://developer.blender.org/rB9f4ec02bb4060c915bd407a3372d1240e4ed85f5

View3D: Fix object without bounds displaying bounding boxes

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

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 e2599d424bb..63932cd986f 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -3109,7 +3109,9 @@ static void OBJECT_cache_populate(void *vedata, Object *ob)
 		DRW_shgroup_forcefield(sgl, ob, view_layer);
 	}
 
-	if (ob->dt == OB_BOUNDBOX) {
+	if ((ob->dt == OB_BOUNDBOX) &&
+	    !ELEM(ob->type, OB_LAMP, OB_CAMERA, OB_EMPTY, OB_SPEAKER, OB_LIGHTPROBE))
+	{
 		if (theme_id == TH_UNDEFINED) {
 			theme_id = DRW_object_wire_theme_get(ob, view_layer, NULL);
 		}
@@ -3148,9 +3150,9 @@ static void OBJECT_cache_populate(void *vedata, Object *ob)
 		}
 
 		/* Don't draw bounding box again if draw type is bound box. */
-		if ((ob->type == OB_EMPTY) &&
-		    (ob->dtx & OB_DRAWBOUNDOX) &&
-		    (ob->dt != OB_BOUNDBOX))
+		if ((ob->dtx & OB_DRAWBOUNDOX) &&
+		    (ob->dt != OB_BOUNDBOX) &&
+		    !ELEM(ob->type, OB_LAMP, OB_CAMERA, OB_EMPTY, OB_SPEAKER, OB_LIGHTPROBE))
 		{
 			DRW_shgroup_bounds(sgl, ob, theme_id);
 		}