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

[Antonio Vazquez]

Commit: 762a08399bb540390758785405c9926384fb5ba4
Author: Antonio Vazquez
Date:   Tue May 29 12:38:38 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB762a08399bb540390758785405c9926384fb5ba4

Merge branch 'blender2.8' into greasepencil-object

 Conflicts:
	source/blender/editors/gpencil/gpencil_edit.c
	source/blender/editors/gpencil/gpencil_paint.c

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



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

diff --cc source/blender/editors/gpencil/gpencil_edit.c
index 04ee9c1bcce,cf9cbbe3765..43219ba0b71
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@@ -2681,34 -2089,27 +2681,35 @@@ typedef enum eGP_ReprojectModes 
  	GP_REPROJECT_SURFACE,
  } eGP_ReprojectModes;
  
 -static int gp_strokes_reproject_poll(bContext *C)
 -{
 -	/* 2 Requirements:
 -	 *  - 1) Editable GP data
 -	 *  - 2) 3D View only (2D editors don't have projection issues)
 -	 */
 -	return (gp_stroke_edit_poll(C) && ED_operator_view3d_active(C));
 -}
 -
  static int gp_strokes_reproject_exec(bContext *C, wmOperator *op)
  {
 +	bGPdata *gpd = ED_gpencil_data_get_active(C);
  	Scene *scene = CTX_data_scene(C);
 +	ToolSettings *ts = CTX_data_tool_settings(C);
 +	Depsgraph *depsgraph = CTX_data_depsgraph(C);
 +	Object *ob = CTX_data_active_object(C);
 +	ScrArea *sa = CTX_wm_area(C);
 +	ARegion *ar = CTX_wm_region(C);
 + 	RegionView3D *rv3d = ar->regiondata;
 +	View3D *v3d = sa->spacedata.first;
 +
  	GP_SpaceConversion gsc = {NULL};
 -	eGP_ReprojectModes mode = RNA_boolean_get(op->ptr, "type");
 +	eGP_ReprojectModes mode = RNA_enum_get(op->ptr, "type");
  	
 +	int lock_axis = ts->gp_sculpt.lock_axis;
 +	float origin[3];
 +
 +	if ((mode == GP_REPROJECT_AXIS) && (lock_axis == GP_LOCKAXIS_NONE)) {
 +		BKE_report(op->reports, RPT_ERROR, "To reproject by axis, a lock axis must be set before");
 +		return OPERATOR_CANCELLED;
 +	}
 +
  	/* init space conversion stuff */
  	gp_point_conversion_init(C, &gsc);
 -	
 +
  	/* init autodist for geometry projection */
  	if (mode == GP_REPROJECT_SURFACE) {
+ 		struct Depsgraph *depsgraph = CTX_data_depsgraph(C);
  		view3d_region_operator_needs_opengl(CTX_wm_window(C), gsc.ar);
  		ED_view3d_autodist_init(depsgraph, gsc.ar, CTX_wm_view3d(C), 0);
  	}
diff --cc source/blender/editors/gpencil/gpencil_paint.c
index 20e752524be,f9b5966dee3..3e41e4de8ec
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@@ -126,13 -115,9 +126,13 @@@ typedef enum eGPencil_PaintFlags 
   *   "p" = op->customdata
   */
  typedef struct tGPsdata {
 +	bContext *C;
 +
 +	Main *bmain;        /* main database pointer */
  	Scene *scene;       /* current scene from context */
- 	Depsgraph *depsgraph;
+ 	struct Depsgraph *depsgraph;
  	
 +	Object *ob;         /* current object */
  	wmWindow *win;      /* window where painting originated */
  	ScrArea *sa;        /* area where painting originated */
  	ARegion *ar;        /* region where painting originated */