Grease Pencil - Storyboarding Features (merge from GPencil_EditStrokes branch)

This merge-commit brings in a number of new features and workflow/UI improvements for
working with Grease Pencil. While these were originally targetted at improving
the workflow for creating 3D storyboards in Blender using the Grease Pencil,
many of these changes should also prove useful in other workflows too.

The main highlights here are:
1) It is now possible to edit Grease Pencil strokes
   - Use D Tab, or toggle the "Enable Editing" toggles in the Toolbar/Properties regions
     to enter "Stroke Edit Mode". In this mode, many common editing tools will
     operate on Grease Pencil stroke points instead.
   - Tools implemented include Select, Select All/Border/Circle/Linked/More/Less,
     Grab, Rotate, Scale, Bend, Shear, To Sphere, Mirror, Duplicate, Delete.
   - Proportional Editing works when using the transform tools

2) Grease Pencil stroke settings can now be animated
   NOTE: Currently drivers don't work, but if time allows, this may still be
         added before the release.

3) Strokes can be drawn with "filled" interiors, using a separate set of
   colour/opacity settings to the ones used for the lines themselves.

   This makes use of OpenGL filled polys, which has the limitation of only
   being able to fill convex shapes. Some artifacts may be visible on concave
   shapes (e.g. pacman's mouth will be overdrawn)

4) "Volumetric Strokes" - An alternative drawing technique for stroke drawing
   has been added which draws strokes as a series of screen-aligned discs.

   While this was originally a partial experimental technique at getting better
   quality 3D lines, the effects possible using this technique were interesting
   enough to warrant making this a dedicated feature. Best results when partial
   opacity and large stroke widths are used.

5) Improved Onion Skinning Support
   - Different colours can be selected for the before/after ghosts. To do so,
     enable the "colour wheel" toggle beside the Onion Skinning toggle, and set
     the colours accordingly.
   - Different numbers of ghosts can be shown before/after the current frame

6) Grease Pencil datablocks are now attached to the scene by default instead of
   the active object.
   - For a long time, the object-attachment has proved to be quite problematic
     for users to keep track of. Now that this is done at scene level, it is
     easier for most users to use.
   - An exception for old files (and for any addons which may benefit from object
     attachment instead), is that if the active object has a Grease Pencil datablock,
     that will be used instead.
   - It is not currently possible to choose object-attachment from the UI, but
     it is simple to do this from the console instead, by doing:
     context.active_object.grease_pencil = bpy.data.grease_pencil["blah"]

7) Various UI Cleanups
   - The layers UI has been cleaned up to use a list instead of the nested-panels
     design. Apart from saving space, this is also much nicer to look at now.

   - The UI code is now all defined in Python. To support this, it has been necessary
     to add some new context properties to make it easier to access these settings.
     e.g. "gpencil_data" for the datablock
          "active_gpencil_layer" and "active_gpencil_frame" for active data,
          "editable_gpencil_strokes" for the strokes that can be edited

   - The "stroke placement/alignment" settings (previously "Drawing Settings" at the
     bottom of the Grease Pencil panel in the Properties Region) is now located in
     the toolbar. These were more toolsettings than properties for how GPencil got drawn.

   - "Use Sketching Sessions" has been renamed "Continuous Drawing", as per a
     suggestion for an earlier discussion on developer.blender.org

   - By default, the painting operator will wait for a mouse button to be pressed
     before it starts creating the stroke. This is to make it easier to include
     this operator in various toolbars/menus/etc.   To get it immediately starting
     (as when you hold down DKEy to draw), set "wait_for_input" to False.

   - GPencil Layers can be rearranged in the "Grease Pencil" mode of the Action Editor

   - Toolbar panels have been added to all the other editors which support these.

8) Pie menus for quick-access to tools
   A set of experimental pie menus has been included for quick access to many
   tools and settings. It is not necessary to use these to get things done,
   but they have been designed to help make certain common tasks easier.

   - Ctrl-D = The main pie menu. Reveals tools in a context sensitive and
              spatially stable manner.
   - D Q    = "Quick Settings" pie. This allows quick access to the active
              layer's settings. Notably, colours, thickness, and turning
              onion skinning on/off.

1 files changed, 839 insertions, 0 deletions

diff --git a/source/blender/editors/gpencil/gpencil_select.c b/source/blender/editors/gpencil/gpencil_select.c
new file mode 100644
index 00000000000..2be5b8dc188
--- /dev/null
+++ b/source/blender/editors/gpencil/gpencil_select.c
@@ -0,0 +1,839 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2014, Blender Foundation
+ * This is a new part of Blender
+ *
+ * Contributor(s): Joshua Leung
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/editors/gpencil/gpencil_select.c
+ *  \ingroup edgpencil
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <math.h>
+
+#include "MEM_guardedalloc.h"
+
+#include "BLI_math.h"
+#include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
+
+#include "DNA_gpencil_types.h"
+#include "DNA_object_types.h"
+#include "DNA_scene_types.h"
+#include "DNA_screen_types.h"
+#include "DNA_space_types.h"
+#include "DNA_view3d_types.h"
+
+#include "BKE_context.h"
+#include "BKE_curve.h"
+#include "BKE_depsgraph.h"
+#include "BKE_global.h"
+#include "BKE_gpencil.h"
+#include "BKE_library.h"
+#include "BKE_object.h"
+#include "BKE_report.h"
+#include "BKE_scene.h"
+#include "BKE_screen.h"
+
+#include "UI_interface.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+
+#include "RNA_access.h"
+#include "RNA_define.h"
+
+#include "UI_view2d.h"
+
+#include "ED_gpencil.h"
+#include "ED_view3d.h"
+#include "ED_keyframing.h"
+
+#include "gpencil_intern.h"
+
+/* ********************************************** */
+/* Polling callbacks */
+
+static int gpencil_select_poll(bContext *C)
+{
+	bGPdata *gpd = ED_gpencil_data_get_active(C);
+	bGPDlayer *gpl = gpencil_layer_getactive(gpd);
+
+	/* only if there's an active layer with an active frame */
+	return (gpl && gpl->actframe);
+}
+
+/* ********************************************** */
+/* Select All Operator */
+
+static int gpencil_select_all_exec(bContext *C, wmOperator *op)
+{
+	bGPdata *gpd = ED_gpencil_data_get_active(C);
+	int action = RNA_enum_get(op->ptr, "action");
+	
+	if (gpd == NULL) {
+		BKE_report(op->reports, RPT_ERROR, "No Grease Pencil data");
+		return OPERATOR_CANCELLED;
+	}
+	
+	/* for "toggle", test for existing selected strokes */
+	if (action == SEL_TOGGLE) {
+		action = SEL_SELECT;
+		
+		CTX_DATA_BEGIN(C, bGPDstroke *, gps, editable_gpencil_strokes)
+		{
+			if (gps->flag & GP_STROKE_SELECT) {
+				action = SEL_DESELECT;
+				break; // XXX: this only gets out of the inner loop...
+			}
+		}
+		CTX_DATA_END;
+	}
+	
+	/* if deselecting, we need to deselect strokes across all frames
+	 *  - Currently, an exception is only given for deselection
+	 *    Selecting and toggling should only affect what's visible,
+	 *    while deselecting helps clean up unintended/forgotten
+	 *    stuff on other frames
+	 */
+	if (action == SEL_DESELECT) {
+		/* deselect strokes across editable layers
+		 * NOTE: we limit ourselves to editable layers, since once a layer is "locked/hidden
+		 *       nothing should be able to touch it
+		 */
+		CTX_DATA_BEGIN(C, bGPDlayer *, gpl, editable_gpencil_layers)
+		{
+			bGPDframe *gpf;
+			
+			/* deselect all strokes on all frames */
+			for (gpf = gpl->frames.first; gpf; gpf = gpf->next) {
+				bGPDstroke *gps;
+				
+				for (gps = gpf->strokes.first; gps; gps = gps->next) {
+					bGPDspoint *pt;
+					int i;
+					
+					for (i = 0, pt = gps->points; i < gps->totpoints; i++, pt++) {
+						pt->flag &= ~GP_SPOINT_SELECT;
+					}
+					
+					gps->flag &= ~GP_STROKE_SELECT;
+				}
+			}
+		}
+		CTX_DATA_END;
+	}
+	else {
+		/* select or deselect all strokes */
+		CTX_DATA_BEGIN(C, bGPDstroke *, gps, editable_gpencil_strokes)
+		{
+			bGPDspoint *pt;
+			int i;
+			bool selected = false;
+			
+			/* Change selection status of all points, then make the stroke match */
+			for (i = 0, pt = gps->points; i < gps->totpoints; i++, pt++) {
+				switch (action) {
+					case SEL_SELECT:
+						pt->flag |= GP_SPOINT_SELECT;
+						break;
+					//case SEL_DESELECT:
+					//	pt->flag &= ~GP_SPOINT_SELECT;
+					//	break;
+					case SEL_INVERT:
+						pt->flag ^= GP_SPOINT_SELECT;
+						break;
+				}
+				
+				if (pt->flag & GP_SPOINT_SELECT)
+					selected = true;
+			}
+			
+			/* Change status of stroke */
+			if (selected)
+				gps->flag |= GP_STROKE_SELECT;
+			else
+				gps->flag &= ~GP_STROKE_SELECT;
+		}
+		CTX_DATA_END;
+	}
+	
+	/* updates */
+	WM_event_add_notifier(C, NC_GPENCIL | NA_SELECTED, NULL);
+	return OPERATOR_FINISHED;
+}
+
+void GPENCIL_OT_select_all(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "(De)select All Strokes";
+	ot->idname = "GPENCIL_OT_select_all";
+	ot->description = "Change selection of all Grease Pencil strokes currently visible";
+	
+	/* callbacks */
+	ot->exec = gpencil_select_all_exec;
+	ot->poll = gpencil_select_poll;
+	
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+	
+	WM_operator_properties_select_all(ot);
+}
+
+/* ********************************************** */
+/* Select Linked */
+
+static int gpencil_select_linked_exec(bContext *C, wmOperator *op)
+{
+	bGPdata *gpd = ED_gpencil_data_get_active(C);
+	
+	if (gpd == NULL) {
+		BKE_report(op->reports, RPT_ERROR, "No Grease Pencil data");
+		return OPERATOR_CANCELLED;
+	}
+	
+	/* select all points in selected strokes */
+	CTX_DATA_BEGIN(C, bGPDstroke *, gps, editable_gpencil_strokes)
+	{
+		if (gps->flag & GP_STROKE_SELECT) {
+			bGPDspoint *pt;
+			int i;
+			
+			for (i = 0, pt = gps->points; i < gps->totpoints; i++, pt++) {
+				pt->flag |= GP_SPOINT_SELECT;
+			}
+		}
+	}
+	CTX_DATA_END;
+	
+	/* updates */
+	WM_event_add_notifier(C, NC_GPENCIL | NA_SELECTED, NULL);
+	return OPERATOR_FINISHED;
+}
+
+void GPENCIL_OT_select_linked(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Select Linked";
+	ot->idname = "GPENCIL_OT_select_linked";
+	ot->description = "Select all points in same strokes as already selected points";
+	
+	/* callbacks */
+	ot->exec = gpencil_select_linked_exec;
+	ot->poll = gpencil_select_poll;
+	
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+}
+
+/* ********************************************** */
+/* Select More */
+
+static int gpencil_select_more_exec(bContext *C, wmOperator *UNUSED(op))
+{
+	CTX_DATA_BEGIN(C, bGPDstroke *, gps, editable_gpencil_strokes)
+	{
+		if (gps->flag & GP_STROKE_SELECT) {
+			bGPDspoint *pt;
+			int i;
+			bool prev_sel;
+			
+			/* First Pass: Go in forward order, expanding selection if previous was selected (pre changes)... 
+			 * - This pass covers the "after" edges of selection islands
+			 */
+			prev_sel = false;
+			for (i = 0, pt = gps->points; i < gps->totpoints; i++, pt++) {
+				if (pt->flag & GP_SPOINT_SELECT) {
+					/* selected point - just set flag for next point */
+					prev_sel = true;
+				}
+				else {
+					/* unselected point - expand selection if previous was selected... */
+					if (prev_sel) {
+						pt->flag |= GP_SPOINT_SELECT;
+					}
+					prev_sel = false;
+				}
+			}
+			
+			/* Second Pass: Go in reverse order, doing the same as before (except in opposite order) 
+			 * - This pass covers the "before" edges of selection islands
+			 */
+			prev_sel = false;
+			for (pt -= 1; i > 0; i--, pt--) {
+				if (pt->flag & GP_SPOINT_SELECT) {
+					prev_sel = true;
+				}
+				else {
+					/* unselected point - expand selection if previous was selected... */
+					if (prev_sel) {
+						pt->flag |= GP_SPOINT_SELECT;
+					}
+					prev_sel = false;
+				}
+			}
+		}
+	}
+	CTX_DATA_END;
+	
+	/* updates */
+	WM_event_add_notifier(C, NC_GPENCIL | NA_SELECTED, NULL);
+	return OPERATOR_FINISHED;
+}
+
+void GPENCIL_OT_select_more(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Select More";
+	ot->idname = "GPENCIL_OT_select_more";
+	ot->description = "Grow sets of selected Grease Pencil points";
+	
+	/* callbacks */
+	ot->exec = gpencil_select_more_exec;
+	ot->poll = gpencil_select_poll;
+	
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+}
+
+/* ********************************************** */
+/* Select Less */
+
+static int gpencil_select_less_exec(bContext *C, wmOperator *UNUSED(op))
+{
+	CTX_DATA_BEGIN(C, bGPDstroke *, gps, editable_gpencil_strokes)
+	{
+		if (gps->flag & GP_STROKE_SELECT) {
+			bGPDspoint *pt;
+			int i;
+			bool prev_sel;
+			
+			/* First Pass: Go in forward order, shrinking selection if previous was not selected (pre changes)... 
+			 * - This pass covers the "after" edges of selection islands
+			 */
+			prev_sel = false;
+			for (i = 0, pt = gps->points; i < gps->totpoints; i++, pt++) {
+				if (pt->flag & GP_SPOINT_SELECT) {
+					/* shrink if previous wasn't selected */
+					if (prev_sel == false) {
+						pt->flag &= ~GP_SPOINT_SELECT;
+					}
+					prev_sel = true;
+				}
+				else {
+					/* mark previous as being unselected - and hence, is trigger for shrinking */
+					prev_sel = false;
+				}
+			}
+			
+			/* Second Pass: Go in reverse order, doing the same as before (except in opposite order) 
+			 * - This pass covers the "before" edges of selection islands
+			 */
+			prev_sel = false;
+			for (pt -= 1; i > 0; i--, pt--) {
+				if (pt->flag & GP_SPOINT_SELECT) {
+					/* shrink if previous wasn't selected */
+					if (prev_sel == false) {
+						pt->flag &= ~GP_SPOINT_SELECT;
+					}
+					prev_sel = true;
+				}
+				else {
+					/* mark previous as being unselected - and hence, is trigger for shrinking */
+					prev_sel = false;
+				}
+			}
+		}
+	}
+	CTX_DATA_END;
+	
+	/* updates */
+	WM_event_add_notifier(C, NC_GPENCIL | NA_SELECTED, NULL);
+	return OPERATOR_FINISHED;
+}
+
+void GPENCIL_OT_select_less(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Select Less";
+	ot->idname = "GPENCIL_OT_select_less";
+	ot->description = "Shrink sets of selected Grease Pencil points";
+	
+	/* callbacks */
+	ot->exec = gpencil_select_less_exec;
+	ot->poll = gpencil_select_poll;
+	
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+}
+
+/* ********************************************** */
+/* Circle Select Operator */
+
+/* Helper to check if a given stroke is within the area */
+/* NOTE: Code here is adapted (i.e. copied directly) from gpencil_paint.c::gp_stroke_eraser_dostroke()
+ *       It would be great to de-duplicate the logic here sometime, but that can wait...
+ */
+static bool gp_stroke_do_circle_sel(bGPDstroke *gps, GP_SpaceConversion *gsc,
+                                    const int mx, const int my, const int radius, 
+                                    const bool select, rcti *rect)
+{
+	bGPDspoint *pt1, *pt2;
+	int x0 = 0, y0 = 0, x1 = 0, y1 = 0;
+	int i;
+	bool changed = false;
+	
+	if (gps->totpoints == 1) {
+		gp_point_to_xy(gsc, gps, gps->points, &x0, &y0);
+		
+		/* do boundbox check first */
+		if ((!ELEM(V2D_IS_CLIPPED, x0, y0)) && BLI_rcti_isect_pt(rect, x0, y0)) {
+			/* only check if point is inside */
+			if (((x0 - mx) * (x0 - mx) + (y0 - my) * (y0 - my)) <= radius * radius) {
+				/* change selection */
+				if (select) {
+					gps->points->flag |= GP_SPOINT_SELECT;
+					gps->flag |= GP_STROKE_SELECT;
+				}
+				else {
+					gps->points->flag &= ~GP_SPOINT_SELECT;
+					gps->flag &= ~GP_STROKE_SELECT;
+				}
+				
+				return true;
+			}
+		}
+	}
+	else {
+		/* Loop over the points in the stroke, checking for intersections 
+		 *  - an intersection means that we touched the stroke
+		 */
+		for (i = 0; (i + 1) < gps->totpoints; i++) {
+			/* get points to work with */
+			pt1 = gps->points + i;
+			pt2 = gps->points + i + 1;
+			
+			gp_point_to_xy(gsc, gps, pt1, &x0, &y0);
+			gp_point_to_xy(gsc, gps, pt2, &x1, &y1);
+			
+			/* check that point segment of the boundbox of the selection stroke */
+			if (((!ELEM(V2D_IS_CLIPPED, x0, y0)) && BLI_rcti_isect_pt(rect, x0, y0)) ||
+			    ((!ELEM(V2D_IS_CLIPPED, x1, y1)) && BLI_rcti_isect_pt(rect, x1, y1)))
+			{
+				int mval[2]  = {mx, my};
+				int mvalo[2] = {mx, my}; /* dummy - this isn't used... */
+				
+				/* check if point segment of stroke had anything to do with
+				 * eraser region  (either within stroke painted, or on its lines)
+				 *  - this assumes that linewidth is irrelevant
+				 */
+				if (gp_stroke_inside_circle(mval, mvalo, radius, x0, y0, x1, y1)) {
+					/* change selection of stroke, and then of both points 
+					 * (as the last point otherwise wouldn't get selected
+					 *  as we only do n-1 loops through) 
+					 */
+					if (select) {
+						pt1->flag |= GP_SPOINT_SELECT;
+						pt2->flag |= GP_SPOINT_SELECT;
+						
+						changed = true;
+					}
+					else {
+						pt1->flag &= ~GP_SPOINT_SELECT;
+						pt2->flag &= ~GP_SPOINT_SELECT;
+						
+						changed = true;
+					}
+				}
+			}
+		}
+		
+		/* Ensure that stroke selection is in sync with its points */
+		gpencil_stroke_sync_selection(gps);
+	}
+	
+	return changed;
+}
+
+
+static int gpencil_circle_select_exec(bContext *C, wmOperator *op)
+{
+	ScrArea *sa = CTX_wm_area(C);
+	
+	const int mx = RNA_int_get(op->ptr, "x");
+	const int my = RNA_int_get(op->ptr, "y");
+	const int radius = RNA_int_get(op->ptr, "radius");
+	
+	const int gesture_mode = RNA_int_get(op->ptr, "gesture_mode");
+	const bool select = (gesture_mode == GESTURE_MODAL_SELECT);
+	
+	GP_SpaceConversion gsc = {0};
+	rcti rect = {0};            /* for bounding rect around circle (for quicky intersection testing) */
+	
+	bool changed = false;
+	
+	
+	/* sanity checks */
+	if (sa == NULL) {
+		BKE_report(op->reports, RPT_ERROR, "No active area");
+		return OPERATOR_CANCELLED;
+	}
+	
+	/* init space conversion stuff */
+	gp_point_conversion_init(C, &gsc);
+	
+	
+	/* rect is rectangle of selection circle */
+	rect.xmin = mx - radius;
+	rect.ymin = my - radius;
+	rect.xmax = mx + radius;
+	rect.ymax = my + radius;
+	
+	
+	/* find visible strokes, and select if hit */
+	CTX_DATA_BEGIN(C, bGPDstroke *, gps, editable_gpencil_strokes)
+	{
+		changed |= gp_stroke_do_circle_sel(gps, &gsc, mx, my, radius, select, &rect);
+	}
+	CTX_DATA_END;
+	
+	/* updates */
+	if (changed) {
+		WM_event_add_notifier(C, NC_GPENCIL | NA_SELECTED, NULL);
+	}
+	
+	return OPERATOR_FINISHED;
+}
+
+void GPENCIL_OT_select_circle(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Circle Select";
+	ot->description = "Select Grease Pencil strokes using brush selection";
+	ot->idname = "GPENCIL_OT_select_circle";
+	
+	/* callbacks */
+	ot->invoke = WM_gesture_circle_invoke;
+	ot->modal = WM_gesture_circle_modal;
+	ot->exec = gpencil_circle_select_exec;
+	ot->poll = gpencil_select_poll;
+	ot->cancel = WM_gesture_circle_cancel;
+	
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+	
+	/* properties */
+	RNA_def_int(ot->srna, "x", 0, INT_MIN, INT_MAX, "X", "", INT_MIN, INT_MAX);
+	RNA_def_int(ot->srna, "y", 0, INT_MIN, INT_MAX, "Y", "", INT_MIN, INT_MAX);
+	RNA_def_int(ot->srna, "radius", 1, 1, INT_MAX, "Radius", "", 1, INT_MAX);
+	RNA_def_int(ot->srna, "gesture_mode", 0, INT_MIN, INT_MAX, "Gesture Mode", "", INT_MIN, INT_MAX);
+}
+
+/* ********************************************** */
+/* Box Selection */
+
+static int gpencil_border_select_exec(bContext *C, wmOperator *op)
+{
+	ScrArea *sa = CTX_wm_area(C);
+	
+	const int gesture_mode = RNA_int_get(op->ptr, "gesture_mode");
+	const bool select = (gesture_mode == GESTURE_MODAL_SELECT);
+	const bool extend = RNA_boolean_get(op->ptr, "extend");
+	
+	GP_SpaceConversion gsc = {0};
+	rcti rect = {0};
+	
+	bool changed = false;
+	
+	
+	/* sanity checks */
+	if (sa == NULL) {
+		BKE_report(op->reports, RPT_ERROR, "No active area");
+		return OPERATOR_CANCELLED;
+	}
+	
+	/* init space conversion stuff */
+	gp_point_conversion_init(C, &gsc);
+	
+	
+	/* deselect all strokes first? */
+	if (select && !extend) {
+		CTX_DATA_BEGIN(C, bGPDstroke *, gps, editable_gpencil_strokes)
+		{
+			bGPDspoint *pt;
+			int i;
+			
+			for (i = 0, pt = gps->points; i < gps->totpoints; i++, pt++) {
+				pt->flag &= ~GP_SPOINT_SELECT;
+			}
+			
+			gps->flag &= ~GP_STROKE_SELECT;
+		}
+		CTX_DATA_END;
+	}
+	
+	/* get settings from operator */
+	WM_operator_properties_border_to_rcti(op, &rect);
+	
+	/* select/deselect points */
+	CTX_DATA_BEGIN(C, bGPDstroke *, gps, editable_gpencil_strokes)
+	{
+		bGPDspoint *pt;
+		int i;
+		
+		for (i = 0, pt = gps->points; i < gps->totpoints; i++, pt++) {
+			int x0, y0;
+			
+			/* convert point coords to screenspace */
+			gp_point_to_xy(&gsc, gps, pt, &x0, &y0);
+			
+			/* test if in selection rect */
+			if ((!ELEM(V2D_IS_CLIPPED, x0, y0)) && BLI_rcti_isect_pt(&rect, x0, y0)) {
+				if (select) {
+					pt->flag |= GP_SPOINT_SELECT;
+				}
+				else {
+					pt->flag &= ~GP_SPOINT_SELECT;
+				}
+				
+				changed = true;
+			}
+		}
+		
+		/* Ensure that stroke selection is in sync with its points */
+		gpencil_stroke_sync_selection(gps);
+	}
+	CTX_DATA_END;
+	
+	/* updates */
+	if (changed) {
+		WM_event_add_notifier(C, NC_GPENCIL | NA_SELECTED, NULL);
+	}
+	
+	return OPERATOR_FINISHED;
+}
+
+void GPENCIL_OT_select_border(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Border Select";
+	ot->description = "Select Grease Pencil strokes within a rectangular region";
+	ot->idname = "GPENCIL_OT_select_border";
+	
+	/* callbacks */
+	ot->invoke = WM_border_select_invoke;
+	ot->exec = gpencil_border_select_exec;
+	ot->modal = WM_border_select_modal;
+	ot->cancel = WM_border_select_cancel;
+	
+	ot->poll = gpencil_select_poll;
+	
+	/* flags */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+	
+	/* rna */
+	WM_operator_properties_gesture_border(ot, true);
+}
+
+/* ********************************************** */
+/* Mouse Click to Select */
+
+static int gpencil_select_exec(bContext *C, wmOperator *op)
+{
+	ScrArea *sa = CTX_wm_area(C);
+	
+	/* "radius" is simply a threshold (screen space) to make it easier to test with a tolerance */
+	const float radius = 0.75f * U.widget_unit;
+	const int radius_squared = (int)(radius * radius);
+	
+	bool extend = RNA_boolean_get(op->ptr, "extend");
+	bool deselect = RNA_boolean_get(op->ptr, "deselect");
+	bool toggle = RNA_boolean_get(op->ptr, "toggle");
+	bool whole = RNA_boolean_get(op->ptr, "entire_strokes");
+	
+	int location[2] = {0};
+	int mx, my;
+	
+	GP_SpaceConversion gsc = {0};
+	
+	bGPDstroke *hit_stroke = NULL;
+	bGPDspoint *hit_point = NULL;
+	
+	/* sanity checks */
+	if (sa == NULL) {
+		BKE_report(op->reports, RPT_ERROR, "No active area");
+		return OPERATOR_CANCELLED;
+	}
+	
+	/* init space conversion stuff */
+	gp_point_conversion_init(C, &gsc);
+	
+	/* get mouse location */
+	RNA_int_get_array(op->ptr, "location", location);
+	
+	mx = location[0];
+	my = location[1];
+	
+	/* First Pass: Find stroke point which gets hit */
+	/* XXX: maybe we should go from the top of the stack down instead... */
+	CTX_DATA_BEGIN(C, bGPDstroke *, gps, editable_gpencil_strokes)
+	{
+		bGPDspoint *pt;
+		int i;
+		int hit_index = -1;
+		
+		/* firstly, check for hit-point */
+		for (i = 0, pt = gps->points; i < gps->totpoints; i++, pt++) {
+			int x0, y0;
+			
+			gp_point_to_xy(&gsc, gps, pt, &x0, &y0);
+		
+			/* do boundbox check first */
+			if (!ELEM(V2D_IS_CLIPPED, x0, x0)) {
+				/* only check if point is inside */
+				if (((x0 - mx) * (x0 - mx) + (y0 - my) * (y0 - my)) <= radius_squared) {				
+					hit_stroke = gps;
+					hit_point  = pt;
+					break;
+				}
+			}
+		}
+		
+		/* skip to next stroke if nothing found */
+		if (hit_index == -1) 
+			continue;
+	}
+	CTX_DATA_END;
+	
+	/* Abort if nothing hit... */
+	if (ELEM(NULL, hit_stroke, hit_point)) {
+		return OPERATOR_CANCELLED;
+	}
+	
+	/* adjust selection behaviour - for toggle option */
+	if (toggle) {
+		deselect = (hit_point->flag & GP_SPOINT_SELECT) != 0;
+	}
+	
+	/* If not extending selection, deselect everything else */
+	if (extend == false) {
+		CTX_DATA_BEGIN(C, bGPDstroke *, gps, editable_gpencil_strokes)
+		{			
+			/* deselect stroke and its points if selected */
+			if (gps->flag & GP_STROKE_SELECT) {
+				bGPDspoint *pt;
+				int i;
+			
+				/* deselect points */
+				for (i = 0, pt = gps->points; i < gps->totpoints; i++, pt++) {
+					pt->flag &= ~GP_SPOINT_SELECT;
+				}
+				
+				/* deselect stroke itself too */
+				gps->flag &= ~GP_STROKE_SELECT;
+			}
+		}
+		CTX_DATA_END;
+	}
+	
+	/* Perform selection operations... */
+	if (whole) {
+		bGPDspoint *pt;
+		int i;
+		
+		/* entire stroke's points */
+		for (i = 0, pt = hit_stroke->points; i < hit_stroke->totpoints; i++, pt++) {
+			if (deselect == false)
+				pt->flag |= GP_SPOINT_SELECT;
+			else
+				pt->flag &= ~GP_SPOINT_SELECT;
+		}
+		
+		/* stroke too... */
+		if (deselect == false)
+			hit_stroke->flag |= GP_STROKE_SELECT;
+		else
+			hit_stroke->flag &= ~GP_STROKE_SELECT;
+	}
+	else {
+		/* just the point (and the stroke) */
+		if (deselect == false) {
+			/* we're adding selection, so selection must be true */
+			hit_point->flag  |= GP_SPOINT_SELECT;
+			hit_stroke->flag |= GP_STROKE_SELECT;
+		}
+		else {
+			/* deselect point */
+			hit_point->flag &= ~GP_SPOINT_SELECT;
+			
+			/* ensure that stroke is selected correctly */
+			gpencil_stroke_sync_selection(hit_stroke);
+		}
+	}
+	
+	/* updates */
+	if (hit_point != NULL) {
+		WM_event_add_notifier(C, NC_GPENCIL | NA_SELECTED, NULL);
+	}
+	
+	return OPERATOR_FINISHED;
+}
+
+static int gpencil_select_invoke(bContext *C, wmOperator *op, const wmEvent *event)
+{
+	RNA_int_set_array(op->ptr, "location", event->mval);
+	return gpencil_select_exec(C, op);
+}
+
+void GPENCIL_OT_select(wmOperatorType *ot)
+{
+	PropertyRNA *prop;
+	
+	/* identifiers */
+	ot->name = "Select";
+	ot->description = "Select Grease Pencil strokes and/or stroke points";
+	ot->idname = "GPENCIL_OT_select";
+	
+	/* callbacks */
+	ot->invoke = gpencil_select_invoke;
+	ot->exec = gpencil_select_exec;
+	ot->poll = gpencil_select_poll;
+	
+	/* flag */
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+	
+	/* properties */
+	WM_operator_properties_mouse_select(ot);
+	
+	prop = RNA_def_boolean(ot->srna, "entire_strokes", false, "Entire Strokes", "Select entire strokes instead of just the nearest stroke vertex");
+	RNA_def_property_flag(prop, PROP_SKIP_SAVE);
+	
+	prop = RNA_def_int_vector(ot->srna, "location", 2, NULL, INT_MIN, INT_MAX, "Location", "Mouse location", INT_MIN, INT_MAX);
+	RNA_def_property_flag(prop, PROP_HIDDEN);
+}
+
+/* ********************************************** */
+
+ 
\ No newline at end of file