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

[Antonio Vazquez]

Commit: 030990fe45eeff8354aeb56be714e14ab54a0a91
Author: Antonio Vazquez
Date:   Tue Jul 25 15:47:26 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB030990fe45eeff8354aeb56be714e14ab54a0a91

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/editors/space_view3d/view3d_edit.c
index 9c48a9dbb7a,8d507ac86c2..23cd8137bdd
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@@ -3068,7 -3068,9 +3068,9 @@@ static int viewselected_exec(bContext *
  	Scene *scene = CTX_data_scene(C);
  	SceneLayer *sl = CTX_data_scene_layer(C);
  	bGPdata *gpd = CTX_data_gpencil_data(C);
 -	const bool is_gp_edit = ((gpd) && (gpd->flag & GP_DATA_STROKE_EDITMODE));
 +	const bool is_gp_edit = ((gpd) && (gpd->flag & (GP_DATA_STROKE_EDITMODE | GP_DATA_STROKE_PAINTMODE | GP_DATA_STROKE_SCULPTMODE)));
+ 	const bool is_face_map = ((is_gp_edit == false) && ar->manipulator_map &&
+ 	                          WM_manipulatormap_is_any_selected(ar->manipulator_map));
  	Object *ob = OBACT_NEW;
  	Object *obedit = CTX_data_edit_object(C);
  	float min[3], max[3];