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

[Antonio Vazquez]

Commit: 13afe1db817c090d0e67401b2884f7a05db3b9c1
Author: Antonio Vazquez
Date:   Fri Jan 26 10:54:44 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rB13afe1db817c090d0e67401b2884f7a05db3b9c1

Merge branch 'blender2.8' into greasepencil-object

 Conflicts:
	source/blender/editors/gpencil/gpencil_edit.c
	source/blender/editors/space_action/action_select.c

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



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

diff --cc source/blender/editors/gpencil/gpencil_edit.c
index fdfe8a31553,22a3224e563..08d86199b88
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@@ -193,33 -102,11 +193,34 @@@ static int gpencil_editmode_toggle_exec
  	gpd->flag ^= GP_DATA_STROKE_EDITMODE;
  	/* recalculate parent matrix */
  	if (gpd->flag & GP_DATA_STROKE_EDITMODE) {
 -		ED_gpencil_reset_layers_parent(gpd);
 +		ED_gpencil_reset_layers_parent(ob, gpd);
 +	}
 +	/* set mode */
 +	if (gpd->flag & GP_DATA_STROKE_EDITMODE) {
 +		mode = OB_MODE_GPENCIL_EDIT;
 +	}
 +	else {
 +		mode = OB_MODE_OBJECT;
 +	}
 +
 +	if (is_object) {
 +		/* try to back previous mode */
 +		if ((ob->restore_mode) && ((gpd->flag & GP_DATA_STROKE_EDITMODE) == 0) && (back == 1)) {
 +			mode = ob->restore_mode;
 +		}
 +		ob->restore_mode = ob->mode;
 +		ob->mode = mode;
  	}
  
 +	/* set workspace mode */
 +	BKE_workspace_object_mode_set(workspace, scene, mode);
 +	/* setup other modes */
 +	gpencil_setup_modes(C, gpd, mode);
 +	/* set cache as dirty */
 +	BKE_gpencil_batch_cache_dirty(gpd);
 +
- 	WM_event_add_notifier(C, NC_GPENCIL | ND_DATA | ND_GPENCIL_EDITMODE, NULL);
+ 	WM_event_add_notifier(C, NC_GPENCIL | ND_DATA, NULL);
+ 	WM_event_add_notifier(C, NC_GPENCIL | ND_GPENCIL_EDITMODE, NULL);
  	WM_event_add_notifier(C, NC_SCENE | ND_MODE, NULL);
  	
  	return OPERATOR_FINISHED;