[Bf-blender-cvs] [ade357d2faa] temp-gpencil-io: GPencil: Code cleanup

[Antonio Vazquez]

Commit: ade357d2faa733d68e546ba92e090b5c68c3a344
Author: Antonio Vazquez
Date:   Tue Jan 19 19:49:44 2021 +0100
Branches: temp-gpencil-io
https://developer.blender.org/rBade357d2faa733d68e546ba92e090b5c68c3a344

GPencil: Code cleanup

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

M	source/blender/io/gpencil/intern/gpencil_io_base.cc
M	source/blender/io/gpencil/intern/gpencil_io_base.h

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

diff --git a/source/blender/io/gpencil/intern/gpencil_io_base.cc b/source/blender/io/gpencil/intern/gpencil_io_base.cc
index 3297e87678b..742ada3f686 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_base.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_base.cc
@@ -239,9 +239,7 @@ bool GpencilIO::gpencil_3d_point_to_screen_space(const float co[3], float r_co[2
  * \param co: 3D position
  * \param r_co: 2D position
  */
-void GpencilIO::gpencil_3d_point_to_project_space(const float mat[4][4],
-                                                  const float co[3],
-                                                  float r_co[2])
+void GpencilIO::gpencil_3d_point_to_project_space(const float co[3], float r_co[2])
 {
   float parent_co[3];
   mul_v3_m4v3(parent_co, diff_mat_, co);
@@ -249,7 +247,7 @@ void GpencilIO::gpencil_3d_point_to_project_space(const float mat[4][4],
   float tmp[4];
   copy_v3_v3(tmp, parent_co);
   tmp[3] = 1.0f;
-  mul_m4_v4(mat, tmp);
+  mul_m4_v4(rv3d_->viewmat, tmp);
 
   copy_v2_v2(r_co, tmp);
 
@@ -272,7 +270,7 @@ void GpencilIO::gpencil_3d_point_to_2D(const float co[3], float r_co[2])
 {
   const bool is_camera = (bool)(rv3d_->persp == RV3D_CAMOB);
   if (is_camera) {
-    gpencil_3d_point_to_project_space(rv3d_->viewmat, co, r_co);
+    gpencil_3d_point_to_project_space(co, r_co);
   }
   else {
     gpencil_3d_point_to_screen_space(co, r_co);
diff --git a/source/blender/io/gpencil/intern/gpencil_io_base.h b/source/blender/io/gpencil/intern/gpencil_io_base.h
index ac11a7132d9..d4b013ca802 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_base.h
+++ b/source/blender/io/gpencil/intern/gpencil_io_base.h
@@ -91,7 +91,7 @@ class GpencilIO {
 
   /* Geometry functions. */
   bool gpencil_3d_point_to_screen_space(const float co[3], float r_co[2]);
-  void gpencil_3d_point_to_project_space(const float mat[4][4], const float co[3], float r_co[2]);
+  void gpencil_3d_point_to_project_space(const float co[3], float r_co[2]);
   void gpencil_3d_point_to_2D(const float co[3], float r_co[2]);
 
   float stroke_point_radius_get(struct bGPDstroke *gps);