[Bf-blender-cvs] [141885f9a7c] greasepencil-refactor: Merge branch 'greasepencil-object' into greasepencil-refactor

[Antonio Vazquez]

Commit: 141885f9a7cb141591b6050dbc0995a6a8b6bc65
Author: Antonio Vazquez
Date:   Wed Jan 8 16:39:31 2020 +0100
Branches: greasepencil-refactor
https://developer.blender.org/rB141885f9a7cb141591b6050dbc0995a6a8b6bc65

Merge branch 'greasepencil-object' into greasepencil-refactor

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



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

diff --cc source/blender/draw/engines/overlay/overlay_engine.c
index 1abd6ff459d,c5430b2dca9..19944e831dd
--- a/source/blender/draw/engines/overlay/overlay_engine.c
+++ b/source/blender/draw/engines/overlay/overlay_engine.c
@@@ -190,10 -184,9 +190,10 @@@ static void OVERLAY_cache_populate(voi
    OVERLAY_PrivateData *pd = data->stl->pd;
    const DRWContextState *draw_ctx = DRW_context_state_get();
    const bool is_select = DRW_state_is_select();
 +  const bool is_gpencil = ob->type == OB_GPENCIL;
    const bool renderable = DRW_object_is_renderable(ob);
    const bool in_pose_mode = ob->type == OB_ARMATURE && OVERLAY_armature_is_pose_mode(ob, draw_ctx);
-   const bool in_edit_mode = BKE_object_is_in_editmode(ob);
+   const bool in_edit_mode = (ob->mode & OB_MODE_EDIT) && BKE_object_is_in_editmode(ob);
    const bool in_particle_edit_mode = ob->mode == OB_MODE_PARTICLE_EDIT;
    const bool in_paint_mode = (ob == draw_ctx->obact) &&
                               (draw_ctx->object_mode & OB_MODE_ALL_PAINT);