[Bf-blender-cvs] [852995d084f] master: Cleaunp: Reorder GPencil function parameters

Antonio Vazquez noreply at git.blender.org
Fri Sep 2 16:12:52 CEST 2022


Commit: 852995d084fe078ff5bd605ade5a347b9092f555
Author: Antonio Vazquez
Date:   Fri Sep 2 16:11:17 2022 +0200
Branches: master
https://developer.blender.org/rB852995d084fe078ff5bd605ade5a347b9092f555

Cleaunp: Reorder GPencil function parameters

It's better to keep stroke as first parameter.

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

M	source/blender/blenkernel/BKE_gpencil_geom.h
M	source/blender/blenkernel/intern/gpencil_geom.cc

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

diff --git a/source/blender/blenkernel/BKE_gpencil_geom.h b/source/blender/blenkernel/BKE_gpencil_geom.h
index fc43cfa078d..33735fddf55 100644
--- a/source/blender/blenkernel/BKE_gpencil_geom.h
+++ b/source/blender/blenkernel/BKE_gpencil_geom.h
@@ -466,8 +466,8 @@ void BKE_gpencil_stroke_uniform_subdivide(struct bGPdata *gpd,
  * This allows for manipulations in 2D but also easy conversion back to 3D.
  * \note also takes care of parent space transform.
  */
-void BKE_gpencil_stroke_to_view_space(float viewmat[4][4],
-                                      struct bGPDstroke *gps,
+void BKE_gpencil_stroke_to_view_space(struct bGPDstroke *gps,
+                                      float viewmat[4][4],
                                       const float diff_mat[4][4]);
 /**
  * Stroke from view space
@@ -475,8 +475,8 @@ void BKE_gpencil_stroke_to_view_space(float viewmat[4][4],
  * Inverse of #BKE_gpencil_stroke_to_view_space
  * \note also takes care of parent space transform.
  */
-void BKE_gpencil_stroke_from_view_space(float viewinv[4][4],
-                                        struct bGPDstroke *gps,
+void BKE_gpencil_stroke_from_view_space(struct bGPDstroke *gps,
+                                        float viewinv[4][4],
                                         const float diff_mat[4][4]);
 /**
  * Calculates the perimeter of a stroke projected from the view and returns it as a new stroke.
diff --git a/source/blender/blenkernel/intern/gpencil_geom.cc b/source/blender/blenkernel/intern/gpencil_geom.cc
index d833249add8..2f1049999d2 100644
--- a/source/blender/blenkernel/intern/gpencil_geom.cc
+++ b/source/blender/blenkernel/intern/gpencil_geom.cc
@@ -3767,8 +3767,8 @@ void BKE_gpencil_stroke_uniform_subdivide(bGPdata *gpd,
   BKE_gpencil_stroke_geometry_update(gpd, gps);
 }
 
-void BKE_gpencil_stroke_to_view_space(float viewmat[4][4],
-                                      bGPDstroke *gps,
+void BKE_gpencil_stroke_to_view_space(bGPDstroke *gps,
+                                      float viewmat[4][4],
                                       const float diff_mat[4][4])
 {
   for (int i = 0; i < gps->totpoints; i++) {
@@ -3780,8 +3780,8 @@ void BKE_gpencil_stroke_to_view_space(float viewmat[4][4],
   }
 }
 
-void BKE_gpencil_stroke_from_view_space(float viewinv[4][4],
-                                        bGPDstroke *gps,
+void BKE_gpencil_stroke_from_view_space(bGPDstroke *gps,
+                                        float viewinv[4][4],
                                         const float diff_mat[4][4])
 {
   float inverse_diff_mat[4][4];
@@ -4245,7 +4245,7 @@ bGPDstroke *BKE_gpencil_stroke_perimeter_from_view(float viewmat[4][4],
     pt_dst->uv_rot = 0;
   }
 
-  BKE_gpencil_stroke_to_view_space(viewmat, gps_temp, diff_mat);
+  BKE_gpencil_stroke_to_view_space(gps_temp, viewmat, diff_mat);
   int num_perimeter_points = 0;
   ListBase *perimeter_points = gpencil_stroke_perimeter_ex(
       gpd, gpl, gps_temp, subdivisions, thickness_chg, &num_perimeter_points);
@@ -4268,7 +4268,7 @@ bGPDstroke *BKE_gpencil_stroke_perimeter_from_view(float viewmat[4][4],
     pt->flag |= GP_SPOINT_SELECT;
   }
 
-  BKE_gpencil_stroke_from_view_space(viewinv, perimeter_stroke, diff_mat);
+  BKE_gpencil_stroke_from_view_space(perimeter_stroke, viewinv, diff_mat);
 
   /* Free temp data. */
   BLI_freelistN(perimeter_points);



More information about the Bf-blender-cvs mailing list