[Bf-blender-cvs] [34c8a7accc1] temp-gpencil-camera-reproject: Merge branch 'master' into temp-gpencil-camera-reproject

[Antonio Vazquez]

Commit: 34c8a7accc1281b7affa58def54efd843cfea3da
Author: Antonio Vazquez
Date:   Mon Jun 21 19:37:40 2021 +0200
Branches: temp-gpencil-camera-reproject
https://developer.blender.org/rB34c8a7accc1281b7affa58def54efd843cfea3da

Merge branch 'master' into temp-gpencil-camera-reproject

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

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



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

diff --cc source/blender/editors/gpencil/gpencil_utils.c
index 04287840a18,c9ef340b9d3..c409d7adedb
--- a/source/blender/editors/gpencil/gpencil_utils.c
+++ b/source/blender/editors/gpencil/gpencil_utils.c
@@@ -1390,14 -1274,9 +1390,15 @@@ void ED_gpencil_stroke_reproject(Depsgr
        /* Planar - All on same plane parallel to the view-plane. */
        gpencil_point_xy_to_3d(gsc, gsc->scene, xy, &pt->x);
      }
 +    else if (mode == GP_REPROJECT_CAMERA) {
 +      /* Convert to Render 2D space. */
 +      ED_gpencil_project_point_to_render_space(gsc->scene, &pt2, persmat, is_ortho, xy);
 +      /* Convert to Global Camera 3D space. */
 +      gpencil_point_render_xy_to_3d(gsc, persmat, persinv, xy, &pt->x);
 +    }
      else {
        /* Geometry - Snap to surfaces of visible geometry */
+       float ray_start[3];
        float ray_normal[3];
        /* magic value for initial depth copied from the default
         * value of Python's Scene.ray_cast function