[Bf-blender-cvs] [f1d0a6dd2d4] greasepencil-object: Merge branch 'master' into greasepencil-object

[Antonio Vazquez]

Commit: f1d0a6dd2d45d19bdf4164f3b7c1250bb6e211a1
Author: Antonio Vazquez
Date:   Wed May 27 15:45:10 2020 +0200
Branches: greasepencil-object
https://developer.blender.org/rBf1d0a6dd2d45d19bdf4164f3b7c1250bb6e211a1

Merge branch 'master' into greasepencil-object

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

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



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

diff --cc source/blender/editors/gpencil/gpencil_edit.c
index 267abe44ff1,4330a07057e..bd5815cf30c
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@@ -3632,20 -3645,25 +3632,20 @@@ static int gp_strokes_reproject_exec(bC
    bGPdata *gpd = ED_gpencil_data_get_active(C);
    Scene *scene = CTX_data_scene(C);
    Main *bmain = CTX_data_main(C);
 -  ToolSettings *ts = CTX_data_tool_settings(C);
    Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C);
 -  Object *ob = CTX_data_active_object(C);
    ARegion *region = CTX_wm_region(C);
 -  RegionView3D *rv3d = region->regiondata;
 -  SnapObjectContext *sctx = NULL;
    int oldframe = (int)DEG_get_ctime(depsgraph);
 +  const eGP_ReprojectModes mode = RNA_enum_get(op->ptr, "type");
 +  const bool keep_original = RNA_boolean_get(op->ptr, "keep_original");
  
 +  /* Init space conversion stuff. */
    GP_SpaceConversion gsc = {NULL};
 -  eGP_ReprojectModes mode = RNA_enum_get(op->ptr, "type");
 -
 -  float origin[3];
 -
 -  /* init space conversion stuff */
 +  SnapObjectContext *sctx = NULL;
    gp_point_conversion_init(C, &gsc);
 +  /* Init snap context for geometry projection. */
-   sctx = ED_transform_snap_object_context_create_view3d(bmain, scene, 0, region, CTX_wm_view3d(C));
++  sctx = ED_transform_snap_object_context_create_view3d(scene, 0, region, CTX_wm_view3d(C));
  
    int cfra_prv = INT_MIN;
 -  /* init snap context for geometry projection */
 -  sctx = ED_transform_snap_object_context_create_view3d(scene, 0, region, CTX_wm_view3d(C));
  
    /* Go through each editable + selected stroke, adjusting each of its points one by one... */
    GP_EDITABLE_STROKES_BEGIN (gpstroke_iter, C, gpl, gps) {