Commit: 25889423d324b386dd6cf9cf60f52ae71f3f5179
Author: Antonioya
Date: Tue Jan 22 17:54:19 2019 +0100
Branches: master
https://developer.blender.org/rB25889423d324b386dd6cf9cf60f52ae71f3f5179
GP: Recalc UV data for primitive strokes
The data was not caculated when complete a primitive and it was only updated
when use Edit mode.
===================================================================
M source/blender/editors/gpencil/gpencil_intern.h
M source/blender/editors/gpencil/gpencil_primitive.c
===================================================================
diff --git a/source/blender/editors/gpencil/gpencil_intern.h
b/source/blender/editors/gpencil/gpencil_intern.h
index dd7b2c0d8bd..8530f729889 100644
--- a/source/blender/editors/gpencil/gpencil_intern.h
+++ b/source/blender/editors/gpencil/gpencil_intern.h
@@ -236,6 +236,9 @@ typedef struct tGPDprimitive {
/** numeric input */
NumInput num;
+
+ /** size in pixels for uv calculation */
+ float totpixlen;
} tGPDprimitive;
diff --git a/source/blender/editors/gpencil/gpencil_primitive.c
b/source/blender/editors/gpencil/gpencil_primitive.c
index 8c92cf588cb..67f241531df 100644
--- a/source/blender/editors/gpencil/gpencil_primitive.c
+++ b/source/blender/editors/gpencil/gpencil_primitive.c
@@ -925,7 +925,36 @@ static void gp_primitive_update_strokes(bContext *C,
tGPDprimitive *tgpi)
tpt->pressure = pressure;
tpt->strength = strength;
tpt->time = p2d->time;
- tpt->uv_fac = 1.0f;
+
+ /* point uv (only 3d view) */
+ if (gpd->runtime.sbuffer_size > 1) {
+ MaterialGPencilStyle *gp_style = tgpi->mat->gp_style;
+ const float pixsize = gp_style->texture_pixsize /
1000000.0f;
+ tGPspoint *tptb = (tGPspoint *)gpd->runtime.sbuffer +
gpd->runtime.sbuffer_size - 2;
+ bGPDspoint spt, spt2;
+
+ /* get origin to reproject point */
+ float origin[3];
+ ED_gp_get_drawing_reference(tgpi->scene, tgpi->ob,
tgpi->gpl,
+ ts->gpencil_v3d_align, origin);
+ /* reproject current */
+ ED_gpencil_tpoint_to_point(tgpi->ar, origin, tpt, &spt);
+ ED_gp_project_point_to_plane(tgpi->ob, tgpi->rv3d,
origin, tgpi->lock_axis - 1, &spt);
+
+ /* reproject previous */
+ ED_gpencil_tpoint_to_point(tgpi->ar, origin, tptb,
&spt2);
+ ED_gp_project_point_to_plane(tgpi->ob, tgpi->rv3d,
origin, tgpi->lock_axis - 1, &spt2);
+ tgpi->totpixlen += len_v3v3(&spt.x, &spt2.x) / pixsize;
+ tpt->uv_fac = tgpi->totpixlen;
+ if ((gp_style) && (gp_style->sima)) {
+ tpt->uv_fac /= gp_style->sima->gen_x;
+ }
+ }
+ else {
+ tgpi->totpixlen = 0.0f;
+ tpt->uv_fac = 0.0f;
+ }
+
tpt->uv_rot = p2d->uv_rot;
gpd->runtime.sbuffer_size++;
@@ -945,7 +974,7 @@ static void gp_primitive_update_strokes(bContext *C,
tGPDprimitive *tgpi)
pt->strength = strength;
pt->time = 0.0f;
pt->flag = 0;
- pt->uv_fac = 1.0f;
+ pt->uv_fac = tpt->uv_fac;
if (gps->dvert != NULL) {
MDeformVert *dvert = &gps->dvert[i];
@@ -1217,6 +1246,9 @@ static void gpencil_primitive_interaction_end(bContext
*C, wmOperator *op, wmWin
gps->thickness = tgpi->brush->size;
gps->flag |= GP_STROKE_RECALC_GEOMETRY;
gps->tot_triangles = 0;
+
+ /* calculate UVs along the stroke */
+ ED_gpencil_calc_stroke_uv(tgpi->ob, gps);
}
/* transfer stroke from temporary buffer to the actual frame */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
