[Bf-blender-cvs] [4ce820c819c] temp-gpencil-eval: Cleanup: Rename BKE_gpencil_calc_stroke_uv function to BKE_gpencil_stroke_uv_update
Antonio Vazquez
noreply at git.blender.org
Thu Jan 16 22:57:04 CET 2020
Commit: 4ce820c819c5a6bd5cbb47304e44993206d7b429
Author: Antonio Vazquez
Date: Thu Jan 16 22:56:45 2020 +0100
Branches: temp-gpencil-eval
https://developer.blender.org/rB4ce820c819c5a6bd5cbb47304e44993206d7b429
Cleanup: Rename BKE_gpencil_calc_stroke_uv function to BKE_gpencil_stroke_uv_update
===================================================================
M source/blender/blenkernel/BKE_gpencil.h
M source/blender/blenkernel/intern/gpencil.c
M source/blender/editors/gpencil/gpencil_utils.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_gpencil.h b/source/blender/blenkernel/BKE_gpencil.h
index c49a3b3cb56..0bc599556a2 100644
--- a/source/blender/blenkernel/BKE_gpencil.h
+++ b/source/blender/blenkernel/BKE_gpencil.h
@@ -261,7 +261,7 @@ void BKE_gpencil_stroke_2d_flat_ref(const struct bGPDspoint *ref_points,
int *r_direction);
void BKE_gpencil_stroke_fill_triangulate(struct bGPDstroke *gps);
void BKE_gpencil_stroke_geometry_update(struct bGPDstroke *gps);
-void BKE_gpencil_calc_stroke_uv(struct bGPDstroke *gps);
+void BKE_gpencil_stroke_uv_update(struct bGPDstroke *gps);
void BKE_gpencil_transform(struct bGPdata *gpd, float mat[4][4]);
diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index 8b95bf6872d..153b2d06d5f 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -2784,7 +2784,7 @@ void BKE_gpencil_stroke_fill_triangulate(bGPDstroke *gps)
}
/* texture coordinate utilities */
-void BKE_gpencil_calc_stroke_uv(bGPDstroke *gps)
+void BKE_gpencil_stroke_uv_update(bGPDstroke *gps)
{
if (gps == NULL || gps->totpoints == 0) {
return;
@@ -2811,7 +2811,7 @@ void BKE_gpencil_stroke_geometry_update(bGPDstroke *gps)
}
/* calc uv data along the stroke */
- BKE_gpencil_calc_stroke_uv(gps);
+ BKE_gpencil_stroke_uv_update(gps);
}
float BKE_gpencil_stroke_length(const bGPDstroke *gps, bool use_3d)
diff --git a/source/blender/editors/gpencil/gpencil_utils.c b/source/blender/editors/gpencil/gpencil_utils.c
index ea9c7ed6a1b..ab3394c2e92 100644
--- a/source/blender/editors/gpencil/gpencil_utils.c
+++ b/source/blender/editors/gpencil/gpencil_utils.c
@@ -2030,7 +2030,7 @@ void ED_gpencil_update_color_uv(Main *bmain, Material *mat)
gps_ma = BKE_material_gpencil_get(ob, gps->mat_nr + 1);
/* update */
if ((gps_ma) && (gps_ma == mat)) {
- BKE_gpencil_calc_stroke_uv(gps);
+ BKE_gpencil_stroke_uv_update(gps);
}
}
}
More information about the Bf-blender-cvs
mailing list