[Bf-blender-cvs] [fd61b49d50a] blender2.8: ObjectMode: Fix Outlines being drawn for BBox meshes

[Clément Foucault]

Commit: fd61b49d50a23d167b6a37238a4c09188a45d7f1
Author: Clément Foucault
Date:   Wed Oct 17 18:09:23 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBfd61b49d50a23d167b6a37238a4c09188a45d7f1

ObjectMode: Fix Outlines being drawn for BBox meshes

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

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 57373678a6a..12881034052 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -2629,7 +2629,7 @@ static void OBJECT_cache_populate(void *vedata, Object 
*ob)
        }
 
        const bool do_outlines = (draw_ctx->v3d->flag & V3D_SELECT_OUTLINE) && 
((ob->base_flag & BASE_SELECTED) != 0) &&
-                                (DRW_object_is_renderable(ob) || (ob->dt == 
OB_WIRE));
+                                ((DRW_object_is_renderable(ob) && (ob->dt > 
OB_WIRE)) || (ob->dt == OB_WIRE));
        const bool show_relations = ((draw_ctx->v3d->flag & V3D_HIDE_HELPLINES) 
== 0);
        const bool hide_object_extra = (v3d->overlay.flag & 
V3D_OVERLAY_HIDE_OBJECT_XTRAS) != 0;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs