[Bf-blender-cvs] [1688a57a8e6] master: Fix T65783: Gpencil Edit mode doesn't round data icon

[Antonioya]

Commit: 1688a57a8e68a71bf16acea1f78395b19406e601
Author: Antonioya
Date:   Thu Jun 13 20:38:31 2019 +0200
Branches: master
https://developer.blender.org/rB1688a57a8e68a71bf16acea1f78395b19406e601

Fix T65783: Gpencil Edit mode doesn't round data icon

See D5071 for more details

Thanks to @brecht for his help

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

M	source/blender/editors/space_outliner/outliner_draw.c

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

diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c
index feff1dc5f4a..2541d0a935c 100644
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -116,6 +116,12 @@ static void outliner_tree_dimensions(SpaceOutliner *soops, int *r_width, int *r_
 static bool is_object_data_in_editmode(const ID *id, const Object *obact)
 {
   const short id_type = GS(id->name);
+
+  if (id_type == ID_GD && obact && obact->data == id) {
+    bGPdata *gpd = (bGPdata *)id;
+    return GPENCIL_EDIT_MODE(gpd);
+  }
+
   return ((obact && (obact->mode & OB_MODE_EDIT)) && (id && OB_DATA_SUPPORT_EDITMODE(id_type)) &&
           (GS(((ID *)obact->data)->name) == id_type) && BKE_object_data_is_in_editmode(id));
 }