[Bf-blender-cvs] [b4640ea0208] blender2.8: DRW: Fix object wire appearing when object is drawn as bounds

Clément Foucault noreply at git.blender.org
Sat Nov 17 14:56:24 CET 2018


Commit: b4640ea02081f20f599d881d119564d5f6d53f83
Author: Clément Foucault
Date:   Sat Nov 17 13:27:28 2018 +0100
Branches: blender2.8
https://developer.blender.org/rBb4640ea02081f20f599d881d119564d5f6d53f83

DRW: Fix object wire appearing when object is drawn as bounds

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

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

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

diff --git a/source/blender/draw/modes/overlay_mode.c b/source/blender/draw/modes/overlay_mode.c
index a5c20033287..3f55c177d09 100644
--- a/source/blender/draw/modes/overlay_mode.c
+++ b/source/blender/draw/modes/overlay_mode.c
@@ -232,11 +232,12 @@ static void overlay_cache_populate(void *vedata, Object *ob)
 	RegionView3D *rv3d = draw_ctx->rv3d;
 	View3D *v3d = draw_ctx->v3d;
 
-	if (!stl->g_data->show_overlays)
-		return;
-
-	if (!DRW_object_is_renderable(ob) && (ob->dt != OB_WIRE))
+	if ((!stl->g_data->show_overlays) ||
+		(ob->dt < OB_WIRE) ||
+		(!DRW_object_is_renderable(ob) && (ob->dt != OB_WIRE)))
+	{
 		return;
+	}
 
 	if (DRW_object_is_renderable(ob) && stl->g_data->overlay.flag & V3D_OVERLAY_FACE_ORIENTATION) {
 		struct GPUBatch *geom = DRW_cache_object_surface_get(ob);



More information about the Bf-blender-cvs mailing list