[Bf-blender-cvs] [63254baad6f] temp-gpencil-camera-reproject: Merge branch 'temp-gpencil-camera-reproject' of git.blender.org:blender into temp-gpencil-camera-reproject

[Falk David]

Commit: 63254baad6fc9e241f702c4070e178f657ed1cc4
Author: Falk David
Date:   Fri May 28 09:52:55 2021 +0200
Branches: temp-gpencil-camera-reproject
https://developer.blender.org/rB63254baad6fc9e241f702c4070e178f657ed1cc4

Merge branch 'temp-gpencil-camera-reproject' of git.blender.org:blender into temp-gpencil-camera-reproject

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



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

diff --cc source/blender/editors/gpencil/gpencil_utils.c
index 1f7bad2dfd8,d3a73afd6e5..959d00c9b94
--- a/source/blender/editors/gpencil/gpencil_utils.c
+++ b/source/blender/editors/gpencil/gpencil_utils.c
@@@ -1308,8 -1290,10 +1308,10 @@@ void ED_gpencil_stroke_reproject(Depsgr
    BKE_gpencil_layer_transform_matrix_get(depsgraph, gsc->ob, gpl, diff_mat);
    invert_m4_m4(inverse_diff_mat, diff_mat);
  
 -  float persmat[4][4];
 +  float persmat[4][4], persinv[4][4];
-   const bool is_ortho = gpencil_calculate_persmat(gsc->scene, persmat, persinv);
+   const bool is_ortho = (mode == GP_REPROJECT_CAMERA) ?
 -                            gpencil_calculate_persmat(gsc->scene, persmat) :
++                            gpencil_calculate_persmat(gsc->scene, persmat, persinv) :
+                             false;
  
    float origin[3];
    if (mode != GP_REPROJECT_CURSOR) {