[Bf-blender-cvs] [c8a9df6a2c8] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object
Antonio Vazquez
noreply at git.blender.org
Fri Oct 20 19:21:24 CEST 2017
Commit: c8a9df6a2c8c412d489ff5cd30a4a0f7de93cb16
Author: Antonio Vazquez
Date: Fri Oct 20 19:21:02 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rBc8a9df6a2c8c412d489ff5cd30a4a0f7de93cb16
Merge branch 'blender2.8' into greasepencil-object
Conflicts:
source/blender/editors/gpencil/drawgpencil.c
===================================================================
===================================================================
diff --cc source/blender/editors/gpencil/drawgpencil.c
index 65e1cc69330,1b6261a6bef..fdfd7d2eb22
--- a/source/blender/editors/gpencil/drawgpencil.c
+++ b/source/blender/editors/gpencil/drawgpencil.c
@@@ -509,15 -461,7 +509,15 @@@ static void gp_triangulate_stroke_fill(
/* convert to 2d and triangulate */
gp_stroke_2d_flat(gps->points, gps->totpoints, points2d, &direction);
- BLI_polyfill_calc((const float(*)[2])points2d, (unsigned int)gps->totpoints, direction, (unsigned int(*)[3])tmp_triangles);
+ BLI_polyfill_calc(points2d, (unsigned int)gps->totpoints, direction, tmp_triangles);
+
+ /* calc texture coordinates automatically */
+ float minv[2];
+ float maxv[2];
+ /* first needs bounding box data */
+ gp_calc_2d_bounding_box((const float(*)[2])points2d, gps->totpoints, minv, maxv, false);
+ /* calc uv data */
+ gp_calc_stroke_text_coordinates((const float(*)[2])points2d, gps->totpoints, minv, maxv, uv);
/* Number of triangles */
gps->tot_triangles = gps->totpoints - 2;
More information about the Bf-blender-cvs
mailing list