Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonio Vazquez <blendergit@gmail.com>2022-09-02 17:11:17 +0300
committerAntonio Vazquez <blendergit@gmail.com>2022-09-02 17:11:23 +0300
commit852995d084fe078ff5bd605ade5a347b9092f555 (patch)
treee7d8c53fa217a2c3b8604d037fcd7fcb94e997b1
parent426d6b4baad9be74c177f8c3376177135447be4f (diff)
Cleaunp: Reorder GPencil function parameters
It's better to keep stroke as first parameter.
-rw-r--r--source/blender/blenkernel/BKE_gpencil_geom.h8
-rw-r--r--source/blender/blenkernel/intern/gpencil_geom.cc12
2 files changed, 10 insertions, 10 deletions
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);