[Bf-blender-cvs] [dd2372f1870] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object

[Antonio Vazquez]

Commit: dd2372f187002fedd12fed2a5083c8f3d1d28aaa
Author: Antonio Vazquez
Date:   Mon Jun 26 12:23:51 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rBdd2372f187002fedd12fed2a5083c8f3d1d28aaa

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/editors/gpencil/gpencil_paint.c
index a6b96a23e1e,b46095d3abb..641f5c15e31
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@@ -2440,11 -2465,9 +2449,11 @@@ static int gpencil_draw_modal(bContext 
  			 *   is essential for ensuring that they can quickly return to that view
  			 */
  		}
- 		else if ((ELEM(event->type, DKEY)) && (event->val == KM_RELEASE)) {
+ 		else if ((ELEM(event->type, p->keymodifier)) && (event->val == KM_RELEASE)) {
  			/* enable continuous if release D key in mid drawing */
 -			p->scene->toolsettings->gpencil_flags |= GP_TOOL_FLAG_PAINTSESSIONS_ON;
 +			if (p->sa->spacetype != SPACE_VIEW3D) {
 +				p->scene->toolsettings->gpencil_flags |= GP_TOOL_FLAG_PAINTSESSIONS_ON;
 +			}
  		}
  		else if ((event->type == BKEY) && (event->val == KM_RELEASE)) {
  			/* Add Blank Frame