ClangFormat: apply to source, most of intern

Apply clang format as proposed in T53211.

For details on usage and instructions for migrating branches
without conflicts, see:

https://wiki.blender.org/wiki/Tools/ClangFormat

1 files changed, 285 insertions, 266 deletions

diff --git a/source/blender/editors/gpencil/gpencil_intern.h b/source/blender/editors/gpencil/gpencil_intern.h
index 3742ca92551..c8d2547ad51 100644
--- a/source/blender/editors/gpencil/gpencil_intern.h
+++ b/source/blender/editors/gpencil/gpencil_intern.h
@@ -24,12 +24,10 @@
 #ifndef __GPENCIL_INTERN_H__
 #define __GPENCIL_INTERN_H__
 
-
 #include "DNA_vec_types.h"
 
 #include "ED_numinput.h"
 
-
 /* internal exports only */
 struct Material;
 struct bGPDspoint;
@@ -53,7 +51,6 @@ struct EnumPropertyItem;
 struct PointerRNA;
 struct PropertyRNA;
 
-
 /* ***************************************************** */
 /* Modal Operator Geometry Preview
  *
@@ -73,172 +70,171 @@ struct PropertyRNA;
 
 /* Temporary draw data (no draw manager mode) */
 typedef struct tGPDdraw {
-	struct RegionView3D *rv3d;          /* region to draw */
-	struct Depsgraph *depsgraph;        /* depsgraph */
-	struct Object *ob;                  /* GP object */
-	struct bGPdata *gpd;                /* current GP datablock */
-	struct bGPDlayer *gpl;              /* layer */
-	struct bGPDframe *gpf;              /* frame */
-	struct bGPDframe *t_gpf;            /* temporal frame */
-	struct bGPDstroke *gps;             /* stroke */
-	int disable_fill;                   /* disable fill */
-	int offsx;                          /* windows offset x */
-	int offsy;                          /* windows offset y */
-	int winx;                           /* windows width */
-	int winy;                           /* windows height */
-	int dflag;                          /* flags datablock */
-	short lthick;                       /* layer thickness */
-	float opacity;                      /* opacity */
-	float tintcolor[4];                 /* tint color */
-	bool onion;                         /* onion flag */
-	bool custonion;                     /* use custom onion colors */
-	bool is_fill_stroke;              /* use fill tool */
-	float diff_mat[4][4];               /* matrix */
+  struct RegionView3D *rv3d;   /* region to draw */
+  struct Depsgraph *depsgraph; /* depsgraph */
+  struct Object *ob;           /* GP object */
+  struct bGPdata *gpd;         /* current GP datablock */
+  struct bGPDlayer *gpl;       /* layer */
+  struct bGPDframe *gpf;       /* frame */
+  struct bGPDframe *t_gpf;     /* temporal frame */
+  struct bGPDstroke *gps;      /* stroke */
+  int disable_fill;            /* disable fill */
+  int offsx;                   /* windows offset x */
+  int offsy;                   /* windows offset y */
+  int winx;                    /* windows width */
+  int winy;                    /* windows height */
+  int dflag;                   /* flags datablock */
+  short lthick;                /* layer thickness */
+  float opacity;               /* opacity */
+  float tintcolor[4];          /* tint color */
+  bool onion;                  /* onion flag */
+  bool custonion;              /* use custom onion colors */
+  bool is_fill_stroke;         /* use fill tool */
+  float diff_mat[4][4];        /* matrix */
 } tGPDdraw;
 
-
 /* Temporary interpolate operation data */
 typedef struct tGPDinterpolate_layer {
-	struct tGPDinterpolate_layer *next, *prev;
-
-	/** layer */
-	struct bGPDlayer *gpl;
-	/** frame before current frame (interpolate-from) */
-	struct bGPDframe *prevFrame;
-	/** frame after current frame (interpolate-to) */
-	struct bGPDframe *nextFrame;
-	/** interpolated frame */
-	struct bGPDframe *interFrame;
-	/** interpolate factor */
-	float factor;
+  struct tGPDinterpolate_layer *next, *prev;
+
+  /** layer */
+  struct bGPDlayer *gpl;
+  /** frame before current frame (interpolate-from) */
+  struct bGPDframe *prevFrame;
+  /** frame after current frame (interpolate-to) */
+  struct bGPDframe *nextFrame;
+  /** interpolated frame */
+  struct bGPDframe *interFrame;
+  /** interpolate factor */
+  float factor;
 
 } tGPDinterpolate_layer;
 
 typedef struct tGPDinterpolate {
-	/** current scene from context */
-	struct Scene *scene;
-	/** area where painting originated */
-	struct ScrArea *sa;
-	/** region where painting originated */
-	struct ARegion *ar;
-	/** current GP datablock */
-	struct bGPdata *gpd;
-	/** current material */
-	struct Material *mat;
-
-	/** current frame number */
-	int cframe;
-	/** (tGPDinterpolate_layer) layers to be interpolated */
-	ListBase ilayers;
-	/** value for determining the displacement influence */
-	float shift;
-	/** initial interpolation factor for active layer */
-	float init_factor;
-	/** shift low limit (-100%) */
-	float low_limit;
-	/** shift upper limit (200%) */
-	float high_limit;
-	/** flag from toolsettings */
-	int flag;
-
-	NumInput num;              /* numeric input */
-	/** handle for drawing strokes while operator is running 3d stuff */
-	void *draw_handle_3d;
-	/** handle for drawing strokes while operator is running screen stuff */
-	void *draw_handle_screen;
+  /** current scene from context */
+  struct Scene *scene;
+  /** area where painting originated */
+  struct ScrArea *sa;
+  /** region where painting originated */
+  struct ARegion *ar;
+  /** current GP datablock */
+  struct bGPdata *gpd;
+  /** current material */
+  struct Material *mat;
+
+  /** current frame number */
+  int cframe;
+  /** (tGPDinterpolate_layer) layers to be interpolated */
+  ListBase ilayers;
+  /** value for determining the displacement influence */
+  float shift;
+  /** initial interpolation factor for active layer */
+  float init_factor;
+  /** shift low limit (-100%) */
+  float low_limit;
+  /** shift upper limit (200%) */
+  float high_limit;
+  /** flag from toolsettings */
+  int flag;
+
+  NumInput num; /* numeric input */
+  /** handle for drawing strokes while operator is running 3d stuff */
+  void *draw_handle_3d;
+  /** handle for drawing strokes while operator is running screen stuff */
+  void *draw_handle_screen;
 } tGPDinterpolate;
 
-
 /* Temporary primitive operation data */
 typedef struct tGPDprimitive {
-	/** main database pointer */
-	struct Main *bmain;
-	struct Depsgraph *depsgraph;
-	/** window where painting originated */
-	struct wmWindow *win;
-	/** current scene from context */
-	struct Scene *scene;
-	/** current active gp object */
-	struct Object *ob;
-	/** area where painting originated */
-	struct ScrArea *sa;
-	/** region where painting originated */
-	struct RegionView3D *rv3d;
-	/** view3d where painting originated */
-	struct View3D *v3d;
-	/** region where painting originated */
-	struct ARegion *ar;
-	/** current GP datablock */
-	struct bGPdata *gpd;
-	/** current material */
-	struct Material *mat;
-	/** current brush */
-	struct Brush *brush;
-
-	/** current frame number */
-	int cframe;
-	/** layer */
-	struct bGPDlayer *gpl;
-	/** frame */
-	struct bGPDframe *gpf;
-	/** type of primitive */
-	int type;
-	/** original type of primitive */
-	int orign_type;
-	/** type of primitive is a curve */
-	bool curve;
-	/** brush size */
-	int brush_size;
-	/** brush strength */
-	float brush_strength;
-	/** flip option */
-	short flip;
-	/** array of data-points for stroke */
-	tGPspoint *points;
-	/** number of edges allocated */
-	int point_count;
-	/** stored number of polygon edges */
-	int tot_stored_edges;
-	/** number of polygon edges */
-	int tot_edges;
-	/** move distance */
-	float move[2];
-	/** initial box corner */
-	float origin[2];
-	/** first box corner */
-	float start[2];
-	/** last box corner */
-	float end[2];
-	/** midpoint box corner */
-	float midpoint[2];
-	/** first control point */
-	float cp1[2];
-	/** second control point */
-	float cp2[2];
-	/** flag to determine control point is selected */
-	int sel_cp;
-	/** flag to determine operations in progress */
-	int flag;
-	/** recorded mouse-position */
-	float mval[2];
-	/** previous recorded mouse-position */
-	float mvalo[2];
-
-	/** lock to viewport axis */
-	int lock_axis;
-	struct RNG *rng;
-
-	/** numeric input */
-	NumInput num;
-
-	/** size in pixels for uv calculation */
-	float totpixlen;
+  /** main database pointer */
+  struct Main *bmain;
+  struct Depsgraph *depsgraph;
+  /** window where painting originated */
+  struct wmWindow *win;
+  /** current scene from context */
+  struct Scene *scene;
+  /** current active gp object */
+  struct Object *ob;
+  /** area where painting originated */
+  struct ScrArea *sa;
+  /** region where painting originated */
+  struct RegionView3D *rv3d;
+  /** view3d where painting originated */
+  struct View3D *v3d;
+  /** region where painting originated */
+  struct ARegion *ar;
+  /** current GP datablock */
+  struct bGPdata *gpd;
+  /** current material */
+  struct Material *mat;
+  /** current brush */
+  struct Brush *brush;
+
+  /** current frame number */
+  int cframe;
+  /** layer */
+  struct bGPDlayer *gpl;
+  /** frame */
+  struct bGPDframe *gpf;
+  /** type of primitive */
+  int type;
+  /** original type of primitive */
+  int orign_type;
+  /** type of primitive is a curve */
+  bool curve;
+  /** brush size */
+  int brush_size;
+  /** brush strength */
+  float brush_strength;
+  /** flip option */
+  short flip;
+  /** array of data-points for stroke */
+  tGPspoint *points;
+  /** number of edges allocated */
+  int point_count;
+  /** stored number of polygon edges */
+  int tot_stored_edges;
+  /** number of polygon edges */
+  int tot_edges;
+  /** move distance */
+  float move[2];
+  /** initial box corner */
+  float origin[2];
+  /** first box corner */
+  float start[2];
+  /** last box corner */
+  float end[2];
+  /** midpoint box corner */
+  float midpoint[2];
+  /** first control point */
+  float cp1[2];
+  /** second control point */
+  float cp2[2];
+  /** flag to determine control point is selected */
+  int sel_cp;
+  /** flag to determine operations in progress */
+  int flag;
+  /** recorded mouse-position */
+  float mval[2];
+  /** previous recorded mouse-position */
+  float mvalo[2];
+
+  /** lock to viewport axis */
+  int lock_axis;
+  struct RNG *rng;
+
+  /** numeric input */
+  NumInput num;
+
+  /** size in pixels for uv calculation */
+  float totpixlen;
 } tGPDprimitive;
 
-
 /* Modal Operator Drawing Callbacks ------------------------ */
 
-void ED_gp_draw_interpolation(const struct bContext *C, struct tGPDinterpolate *tgpi, const int type);
+void ED_gp_draw_interpolation(const struct bContext *C,
+                              struct tGPDinterpolate *tgpi,
+                              const int type);
 void ED_gp_draw_fill(struct tGPDdraw *tgpw);
 
 /* ***************************************************** */
@@ -248,55 +244,74 @@ void ED_gp_draw_fill(struct tGPDdraw *tgpw);
 /* gpencil_utils.c */
 
 typedef struct GP_SpaceConversion {
-	struct Scene *scene;
-	struct Object *ob;
-	struct bGPdata *gpd;
-	struct bGPDlayer *gpl;
+  struct Scene *scene;
+  struct Object *ob;
+  struct bGPdata *gpd;
+  struct bGPDlayer *gpl;
 
-	struct ScrArea *sa;
-	struct ARegion *ar;
-	struct View2D *v2d;
+  struct ScrArea *sa;
+  struct ARegion *ar;
+  struct View2D *v2d;
 
-	rctf *subrect;       /* for using the camera rect within the 3d view */
-	rctf subrect_data;
+  rctf *subrect; /* for using the camera rect within the 3d view */
+  rctf subrect_data;
 
-	float mat[4][4];     /* transform matrix on the strokes (introduced in [b770964]) */
+  float mat[4][4]; /* transform matrix on the strokes (introduced in [b770964]) */
 } GP_SpaceConversion;
 
 bool gp_stroke_inside_circle(
-        const float mval[2], const float UNUSED(mvalo[2]),
-        int rad, int x0, int y0, int x1, int y1);
+    const float mval[2], const float UNUSED(mvalo[2]), int rad, int x0, int y0, int x1, int y1);
 
 void gp_point_conversion_init(struct bContext *C, GP_SpaceConversion *r_gsc);
 
-void gp_point_to_xy(
-        const GP_SpaceConversion *gsc, const struct bGPDstroke *gps, const struct bGPDspoint *pt,
-        int *r_x, int *r_y);
+void gp_point_to_xy(const GP_SpaceConversion *gsc,
+                    const struct bGPDstroke *gps,
+                    const struct bGPDspoint *pt,
+                    int *r_x,
+                    int *r_y);
 
-void gp_point_to_xy_fl(
-        const GP_SpaceConversion *gsc, const bGPDstroke *gps, const bGPDspoint *pt,
-        float *r_x, float *r_y);
+void gp_point_to_xy_fl(const GP_SpaceConversion *gsc,
+                       const bGPDstroke *gps,
+                       const bGPDspoint *pt,
+                       float *r_x,
+                       float *r_y);
 
 void gp_point_to_parent_space(const bGPDspoint *pt, const float diff_mat[4][4], bGPDspoint *r_pt);
 /**
  * Change points position relative to parent object
  */
-void gp_apply_parent(struct Depsgraph *depsgraph, struct Object *obact, bGPdata *gpd, bGPDlayer *gpl, bGPDstroke *gps);
+void gp_apply_parent(struct Depsgraph *depsgraph,
+                     struct Object *obact,
+                     bGPdata *gpd,
+                     bGPDlayer *gpl,
+                     bGPDstroke *gps);
 /**
  * Change point position relative to parent object
  */
-void gp_apply_parent_point(struct Depsgraph *depsgraph, struct Object *obact, bGPdata *gpd, bGPDlayer *gpl, bGPDspoint *pt);
-
-void gp_point_3d_to_xy(const GP_SpaceConversion *gsc, const short flag, const float pt[3], float xy[2]);
-
-bool gp_point_xy_to_3d(const GP_SpaceConversion *gsc, struct Scene *scene, const float screen_co[2], float r_out[3]);
+void gp_apply_parent_point(struct Depsgraph *depsgraph,
+                           struct Object *obact,
+                           bGPdata *gpd,
+                           bGPDlayer *gpl,
+                           bGPDspoint *pt);
+
+void gp_point_3d_to_xy(const GP_SpaceConversion *gsc,
+                       const short flag,
+                       const float pt[3],
+                       float xy[2]);
+
+bool gp_point_xy_to_3d(const GP_SpaceConversion *gsc,
+                       struct Scene *scene,
+                       const float screen_co[2],
+                       float r_out[3]);
 
 /* helper to convert 2d to 3d */
-void gp_stroke_convertcoords_tpoint(
-        struct Scene *scene, struct ARegion *ar,
-        struct Object *ob,
-        bGPDlayer *gpl, const struct tGPspoint *point2D,
-        float *depth, float out[3]);
+void gp_stroke_convertcoords_tpoint(struct Scene *scene,
+                                    struct ARegion *ar,
+                                    struct Object *ob,
+                                    bGPDlayer *gpl,
+                                    const struct tGPspoint *point2D,
+                                    float *depth,
+                                    float out[3]);
 
 /* Poll Callbacks ------------------------------------ */
 /* gpencil_utils.c */
@@ -316,9 +331,12 @@ struct GHash *gp_copybuf_validate_colormap(struct bContext *C);
 
 /* Stroke Editing ------------------------------------ */
 
-void gp_stroke_delete_tagged_points(
-        bGPDframe *gpf, bGPDstroke *gps, bGPDstroke *next_stroke,
-        int tag_flags, bool select, int limit);
+void gp_stroke_delete_tagged_points(bGPDframe *gpf,
+                                    bGPDstroke *gps,
+                                    bGPDstroke *next_stroke,
+                                    int tag_flags,
+                                    bool select,
+                                    int limit);
 int gp_delete_selected_point_wrap(bContext *C);
 
 void gp_subdivide_stroke(bGPDstroke *gps, const int subdivide);
@@ -326,12 +344,14 @@ void gp_randomize_stroke(bGPDstroke *gps, Brush *brush, struct RNG *rng);
 
 /* Layers Enums -------------------------------------- */
 
-const struct EnumPropertyItem *ED_gpencil_layers_enum_itemf(
-        struct bContext *C, struct PointerRNA *ptr, struct PropertyRNA *prop,
-        bool *r_free);
-const struct EnumPropertyItem *ED_gpencil_layers_with_new_enum_itemf(
-        struct bContext *C, struct PointerRNA *ptr, struct PropertyRNA *prop,
-        bool *r_free);
+const struct EnumPropertyItem *ED_gpencil_layers_enum_itemf(struct bContext *C,
+                                                            struct PointerRNA *ptr,
+                                                            struct PropertyRNA *prop,
+                                                            bool *r_free);
+const struct EnumPropertyItem *ED_gpencil_layers_with_new_enum_itemf(struct bContext *C,
+                                                                     struct PointerRNA *ptr,
+                                                                     struct PropertyRNA *prop,
+                                                                     bool *r_free);
 
 /* ***************************************************** */
 /* Operator Defines */
@@ -340,7 +360,6 @@ const struct EnumPropertyItem *ED_gpencil_layers_with_new_enum_itemf(
 
 void GPENCIL_OT_annotate(struct wmOperatorType *ot);
 
-
 /* drawing ---------- */
 
 void GPENCIL_OT_draw(struct wmOperatorType *ot);
@@ -352,15 +371,15 @@ void GPENCIL_OT_guide_rotate(struct wmOperatorType *ot);
 
 /* Paint Modes for operator */
 typedef enum eGPencil_PaintModes {
-	GP_PAINTMODE_DRAW = 0,
-	GP_PAINTMODE_ERASER,
-	GP_PAINTMODE_DRAW_STRAIGHT,
-	GP_PAINTMODE_DRAW_POLY,
-	GP_PAINTMODE_SET_CP,
+  GP_PAINTMODE_DRAW = 0,
+  GP_PAINTMODE_ERASER,
+  GP_PAINTMODE_DRAW_STRAIGHT,
+  GP_PAINTMODE_DRAW_POLY,
+  GP_PAINTMODE_SET_CP,
 } eGPencil_PaintModes;
 
 /* maximum sizes of gp-session buffer */
-#define GP_STROKE_BUFFER_MAX    5000
+#define GP_STROKE_BUFFER_MAX 5000
 
 /* stroke editing ----- */
 
@@ -436,21 +455,21 @@ void GPENCIL_OT_frame_clean_loose(struct wmOperatorType *ot);
 void GPENCIL_OT_convert(struct wmOperatorType *ot);
 
 enum {
-	GP_STROKE_JOIN = -1,
-	GP_STROKE_JOINCOPY = 1,
+  GP_STROKE_JOIN = -1,
+  GP_STROKE_JOINCOPY = 1,
 };
 
 enum {
-	GP_STROKE_BOX = -1,
-	GP_STROKE_LINE = 1,
-	GP_STROKE_CIRCLE = 2,
-	GP_STROKE_ARC = 3,
-	GP_STROKE_CURVE = 4,
+  GP_STROKE_BOX = -1,
+  GP_STROKE_LINE = 1,
+  GP_STROKE_CIRCLE = 2,
+  GP_STROKE_ARC = 3,
+  GP_STROKE_CURVE = 4,
 };
 
 enum {
-	GP_MERGE_STROKE = -1,
-	GP_MERGE_POINT = 1,
+  GP_MERGE_STROKE = -1,
+  GP_MERGE_POINT = 1,
 };
 
 void GPENCIL_OT_stroke_arrange(struct wmOperatorType *ot);
@@ -520,20 +539,20 @@ void GPENCIL_OT_generate_weights(struct wmOperatorType *ot);
 /* XXX - TODO: replace this with the modern bAnimListElem... */
 /* This struct defines a structure used for quick access */
 typedef struct bActListElem {
-	struct bActListElem *next, *prev;
+  struct bActListElem *next, *prev;
 
-	void *data;   /* source data this elem represents */
-	int   type;   /* one of the ACTTYPE_* values */
-	int   flag;   /* copy of elem's flags for quick access */
-	int   index;  /* copy of adrcode where applicable */
+  void *data; /* source data this elem represents */
+  int type;   /* one of the ACTTYPE_* values */
+  int flag;   /* copy of elem's flags for quick access */
+  int index;  /* copy of adrcode where applicable */
 
-	void  *key_data;  /* motion data - ipo or ipo-curve */
-	short  datatype;  /* type of motion data to expect */
+  void *key_data; /* motion data - ipo or ipo-curve */
+  short datatype; /* type of motion data to expect */
 
-	struct bActionGroup *grp;   /* action group that owns the channel */
+  struct bActionGroup *grp; /* action group that owns the channel */
 
-	void  *owner;      /* will either be an action channel or fake ipo-channel (for keys) */
-	short  ownertype;  /* type of owner */
+  void *owner;     /* will either be an action channel or fake ipo-channel (for keys) */
+  short ownertype; /* type of owner */
 } bActListElem;
 
 /* ****************************************************** */
@@ -541,29 +560,29 @@ typedef struct bActListElem {
 
 /* filtering flags  - under what circumstances should a channel be added */
 typedef enum ACTFILTER_FLAGS {
-	ACTFILTER_VISIBLE       = (1 << 0),   /* should channels be visible */
-	ACTFILTER_SEL           = (1 << 1),   /* should channels be selected */
-	ACTFILTER_FOREDIT       = (1 << 2),   /* does editable status matter */
-	ACTFILTER_CHANNELS      = (1 << 3),   /* do we only care that it is a channel */
-	ACTFILTER_IPOKEYS       = (1 << 4),   /* only channels referencing ipo's */
-	ACTFILTER_ONLYICU       = (1 << 5),   /* only reference ipo-curves */
-	ACTFILTER_FORDRAWING    = (1 << 6),   /* make list for interface drawing */
-	ACTFILTER_ACTGROUPED    = (1 << 7),   /* belongs to the active group */
+  ACTFILTER_VISIBLE = (1 << 0),    /* should channels be visible */
+  ACTFILTER_SEL = (1 << 1),        /* should channels be selected */
+  ACTFILTER_FOREDIT = (1 << 2),    /* does editable status matter */
+  ACTFILTER_CHANNELS = (1 << 3),   /* do we only care that it is a channel */
+  ACTFILTER_IPOKEYS = (1 << 4),    /* only channels referencing ipo's */
+  ACTFILTER_ONLYICU = (1 << 5),    /* only reference ipo-curves */
+  ACTFILTER_FORDRAWING = (1 << 6), /* make list for interface drawing */
+  ACTFILTER_ACTGROUPED = (1 << 7), /* belongs to the active group */
 } ACTFILTER_FLAGS;
 
 /* Action Editor - Main Data types */
 typedef enum ACTCONT_TYPES {
-	ACTCONT_NONE = 0,
-	ACTCONT_ACTION,
-	ACTCONT_SHAPEKEY,
-	ACTCONT_GPENCIL,
+  ACTCONT_NONE = 0,
+  ACTCONT_ACTION,
+  ACTCONT_SHAPEKEY,
+  ACTCONT_GPENCIL,
 } ACTCONT_TYPES;
 
 /* ****************************************************** */
 /* Stroke Iteration Utilities */
 
 struct GP_EditableStrokes_Iter {
-	float diff_mat[4][4];
+  float diff_mat[4][4];
 };
 
 /**
@@ -576,42 +595,42 @@ struct GP_EditableStrokes_Iter {
  * \param gps: The identifier to use for current stroke being processed.
  *                    Choose a suitable value to avoid name clashes.
  */
-#define GP_EDITABLE_STROKES_BEGIN(gpstroke_iter, C, gpl, gps)                           \
-{                                                                                       \
-	struct GP_EditableStrokes_Iter gpstroke_iter = {{{0}}};                             \
-	Depsgraph *depsgraph_ = CTX_data_depsgraph(C);                                      \
-	Object *obact_ = CTX_data_active_object(C);                                         \
-	bGPdata *gpd_ = CTX_data_gpencil_data(C);                                           \
-	const bool is_multiedit_ = (bool)GPENCIL_MULTIEDIT_SESSIONS_ON(gpd_);               \
-	CTX_DATA_BEGIN(C, bGPDlayer *, gpl, editable_gpencil_layers)                        \
-	{                                                                                   \
-		bGPDframe *init_gpf_ = gpl->actframe;                                           \
-		if (is_multiedit_) {                                                            \
-			init_gpf_ = gpl->frames.first;                                              \
-		}                                                                               \
-		for (bGPDframe *gpf_ = init_gpf_; gpf_; gpf_ = gpf_->next) {                    \
-			if ((gpf_ == gpl->actframe) || ((gpf_->flag & GP_FRAME_SELECT) && is_multiedit_)) { \
-				ED_gpencil_parent_location(depsgraph_, obact_, gpd_, gpl, gpstroke_iter.diff_mat); \
-				/* loop over strokes */                                                         \
-				for (bGPDstroke *gps = gpf_->strokes.first; gps; gps = gps->next) {             \
-					/* skip strokes that are invalid for current view */                        \
-					if (ED_gpencil_stroke_can_use(C, gps) == false)                             \
-						continue;                                                               \
-					/* check if the color is editable */                                        \
-					if (ED_gpencil_stroke_color_use(obact_, gpl, gps) == false)                 \
-						continue;                                                               \
-					/* ... Do Stuff With Strokes ...  */
-
-#define GP_EDITABLE_STROKES_END(gpstroke_iter)  \
-				}                  \
-			}                      \
-			if (!is_multiedit_) {  \
-				break;             \
-			}                      \
-		}                          \
-	}                              \
-	CTX_DATA_END;                  \
-} (void)0
+#define GP_EDITABLE_STROKES_BEGIN(gpstroke_iter, C, gpl, gps) \
+  { \
+    struct GP_EditableStrokes_Iter gpstroke_iter = {{{0}}}; \
+    Depsgraph *depsgraph_ = CTX_data_depsgraph(C); \
+    Object *obact_ = CTX_data_active_object(C); \
+    bGPdata *gpd_ = CTX_data_gpencil_data(C); \
+    const bool is_multiedit_ = (bool)GPENCIL_MULTIEDIT_SESSIONS_ON(gpd_); \
+    CTX_DATA_BEGIN (C, bGPDlayer *, gpl, editable_gpencil_layers) { \
+      bGPDframe *init_gpf_ = gpl->actframe; \
+      if (is_multiedit_) { \
+        init_gpf_ = gpl->frames.first; \
+      } \
+      for (bGPDframe *gpf_ = init_gpf_; gpf_; gpf_ = gpf_->next) { \
+        if ((gpf_ == gpl->actframe) || ((gpf_->flag & GP_FRAME_SELECT) && is_multiedit_)) { \
+          ED_gpencil_parent_location(depsgraph_, obact_, gpd_, gpl, gpstroke_iter.diff_mat); \
+          /* loop over strokes */ \
+          for (bGPDstroke *gps = gpf_->strokes.first; gps; gps = gps->next) { \
+            /* skip strokes that are invalid for current view */ \
+            if (ED_gpencil_stroke_can_use(C, gps) == false) \
+              continue; \
+            /* check if the color is editable */ \
+            if (ED_gpencil_stroke_color_use(obact_, gpl, gps) == false) \
+              continue; \
+    /* ... Do Stuff With Strokes ...  */
+
+#define GP_EDITABLE_STROKES_END(gpstroke_iter) \
+  } \
+  } \
+  if (!is_multiedit_) { \
+    break; \
+  } \
+  } \
+  } \
+  CTX_DATA_END; \
+  } \
+  (void)0
 
 /* ****************************************************** */