[Bf-blender-cvs] [74315997ba3] temp-gpencil-camera-reproject: GPencil: Remove duplicate parameter

[Antonio Vazquez]

Commit: 74315997ba36309b522a4f2bb4f611e0204b1a20
Author: Antonio Vazquez
Date:   Thu May 27 19:14:31 2021 +0200
Branches: temp-gpencil-camera-reproject
https://developer.blender.org/rB74315997ba36309b522a4f2bb4f611e0204b1a20

GPencil: Remove duplicate parameter

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

M	source/blender/editors/gpencil/gpencil_intern.h
M	source/blender/editors/gpencil/gpencil_utils.c

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

diff --git a/source/blender/editors/gpencil/gpencil_intern.h b/source/blender/editors/gpencil/gpencil_intern.h
index 795a98044da..27ef2729c1b 100644
--- a/source/blender/editors/gpencil/gpencil_intern.h
+++ b/source/blender/editors/gpencil/gpencil_intern.h
@@ -272,7 +272,6 @@ bool gpencil_point_xy_to_3d(const GP_SpaceConversion *gsc,
                             float r_out[3]);
 
 bool gpencil_point_render_xy_to_3d(const GP_SpaceConversion *gsc,
-                                   struct Scene *scene,
                                    float persmat[4][4],
                                    const float screen_co[2],
                                    float r_out[3]);
diff --git a/source/blender/editors/gpencil/gpencil_utils.c b/source/blender/editors/gpencil/gpencil_utils.c
index 6326ed613c5..95d3fe7947a 100644
--- a/source/blender/editors/gpencil/gpencil_utils.c
+++ b/source/blender/editors/gpencil/gpencil_utils.c
@@ -976,12 +976,12 @@ bool gpencil_point_xy_to_3d(const GP_SpaceConversion *gsc,
 }
 
 bool gpencil_point_render_xy_to_3d(const GP_SpaceConversion *gsc,
-                                   struct Scene *scene,
                                    float persmat[4][4],
                                    const float screen_co[2],
                                    float r_out[3])
 {
   float rvec[3];
+  Scene *scene = gsc->scene;
 
   ED_gpencil_drawing_reference_get(scene, gsc->ob, scene->toolsettings->gpencil_v3d_align, rvec);
 
@@ -1374,7 +1374,7 @@ void ED_gpencil_stroke_reproject(Depsgraph *depsgraph,
       /* 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, gsc->scene, persmat, xy, &pt->x);
+      gpencil_point_render_xy_to_3d(gsc, persmat, xy, &pt->x);
       /* Convert to object local space. */
       mul_m4_v3(inverse_diff_mat, &pt->x);
     }