[Bf-blender-cvs] [b33c61a4afd] greasepencil-refactor: GPencil: Refactor: Add gpencil case to BKE_object_is_in_editmode

[Clément Foucault]

Commit: b33c61a4afd6b9c9bb5b202a7e3b5a2f6b03dc5a
Author: Clément Foucault
Date:   Thu Jan 9 20:41:43 2020 +0100
Branches: greasepencil-refactor
https://developer.blender.org/rBb33c61a4afd6b9c9bb5b202a7e3b5a2f6b03dc5a

GPencil: Refactor: Add gpencil case to BKE_object_is_in_editmode

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

M	source/blender/blenkernel/intern/object.c
M	source/blender/makesdna/DNA_gpencil_types.h

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

diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 01530c1d933..abb6cfbe571 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -595,6 +595,9 @@ bool BKE_object_is_in_editmode(const Object *ob)
     case OB_SURF:
     case OB_CURVE:
       return ((Curve *)ob->data)->editnurb != NULL;
+    case OB_GPENCIL:
+      /* Grease Pencil object has no edit mode data. */
+      return GPENCIL_EDIT_MODE((bGPdata *)ob->data);
     default:
       return false;
   }
diff --git a/source/blender/makesdna/DNA_gpencil_types.h b/source/blender/makesdna/DNA_gpencil_types.h
index 5d10a4f90d7..2e0db70fc90 100644
--- a/source/blender/makesdna/DNA_gpencil_types.h
+++ b/source/blender/makesdna/DNA_gpencil_types.h
@@ -699,7 +699,7 @@ typedef enum eGP_DrawMode {
   ((gpd) && \
    (gpd->flag & (GP_DATA_STROKE_PAINTMODE | GP_DATA_STROKE_EDITMODE | GP_DATA_STROKE_SCULPTMODE | \
                  GP_DATA_STROKE_WEIGHTMODE | GP_DATA_STROKE_VERTEXMODE)))
-#define GPENCIL_EDIT_MODE(gpd) ((gpd) && (gpd->flag & GP_DATA_STROKE_EDITMODE))
+#define GPENCIL_EDIT_MODE(gpd) ((gpd) && ((gpd)->flag & GP_DATA_STROKE_EDITMODE))
 #define GPENCIL_ANY_EDIT_MODE(gpd) \
   ((gpd) && (gpd->flag & \
              (GP_DATA_STROKE_EDITMODE | GP_DATA_STROKE_SCULPTMODE | GP_DATA_STROKE_WEIGHTMODE)))