[Bf-blender-cvs] [a34297a6d64] master: GP: Fix UV error for second point

Antonioya noreply at git.blender.org
Tue Jan 22 20:14:18 CET 2019


Commit: a34297a6d64d1a44a504e93a8a6cd383aa014382
Author: Antonioya
Date:   Tue Jan 22 20:13:56 2019 +0100
Branches: master
https://developer.blender.org/rBa34297a6d64d1a44a504e93a8a6cd383aa014382

GP: Fix UV error for second point

The UV was not calculated for second point (1), only first and > 1

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

M	source/blender/editors/gpencil/gpencil_paint.c
M	source/blender/editors/gpencil/gpencil_primitive.c

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

diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c
index eaa5345eae1..e025dd9b261 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -755,9 +755,9 @@ static short gp_stroke_addpoint(
 		pt->time = (float)(curtime - p->inittime);
 
 		/* point uv (only 3d view) */
-		if ((p->sa->spacetype == SPACE_VIEW3D) && (gpd->runtime.sbuffer_size > 1)) {
+		if ((p->sa->spacetype == SPACE_VIEW3D) && (gpd->runtime.sbuffer_size > 0)) {
 			float pixsize = gp_style->texture_pixsize / 1000000.0f;
-			tGPspoint *ptb = (tGPspoint *)gpd->runtime.sbuffer + gpd->runtime.sbuffer_size - 2;
+			tGPspoint *ptb = (tGPspoint *)gpd->runtime.sbuffer + gpd->runtime.sbuffer_size - 1;
 			bGPDspoint spt, spt2;
 
 			/* get origin to reproject point */
diff --git a/source/blender/editors/gpencil/gpencil_primitive.c b/source/blender/editors/gpencil/gpencil_primitive.c
index 67f241531df..a4954100bae 100644
--- a/source/blender/editors/gpencil/gpencil_primitive.c
+++ b/source/blender/editors/gpencil/gpencil_primitive.c
@@ -926,11 +926,11 @@ static void gp_primitive_update_strokes(bContext *C, tGPDprimitive *tgpi)
 		tpt->strength = strength;
 		tpt->time = p2d->time;
 
-		/* point uv (only 3d view) */
-		if (gpd->runtime.sbuffer_size > 1) {
+		/* point uv */
+		if (gpd->runtime.sbuffer_size > 0) {
 			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;
+			tGPspoint *tptb = (tGPspoint *)gpd->runtime.sbuffer + gpd->runtime.sbuffer_size - 1;
 			bGPDspoint spt, spt2;
 
 			/* get origin to reproject point */



More information about the Bf-blender-cvs mailing list