[Bf-blender-cvs] [15525cac41a] greasepencil-refactor: Cleanup: GPencil: Rename struct member
Clément Foucault
noreply at git.blender.org
Tue Dec 31 19:31:21 CET 2019
Commit: 15525cac41aa431e73f470e2cb8cb5509990f028
Author: Clément Foucault
Date: Tue Dec 31 17:40:29 2019 +0100
Branches: greasepencil-refactor
https://developer.blender.org/rB15525cac41aa431e73f470e2cb8cb5509990f028
Cleanup: GPencil: Rename struct member
===================================================================
M source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
===================================================================
diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c b/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
index bebc81510ca..d166857d86c 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
@@ -72,8 +72,7 @@ typedef struct gpStrokeVert {
/** Position and thickness packed in the same attribute. */
float pos[3], thickness;
float col[4];
- /** UV and strength packed in the same attribute. */
- float uv[2], u_stroke, v_rot;
+ float uv_fill[2], u_stroke, v_rot;
} gpStrokeVert;
static GPUVertFormat *gpencil_stroke_format(void)
@@ -117,7 +116,7 @@ static void gpencil_buffer_add_point(
const bool round_cap1 = (gps->caps[1] == GP_STROKE_CAP_ROUND);
gpStrokeVert *vert = &verts[v];
copy_v3_v3(vert->pos, &pt->x);
- copy_v2_v2(vert->uv, pt->uv_fill);
+ copy_v2_v2(vert->uv_fill, pt->uv_fill);
copy_v4_v4(vert->col, pt->mix_color);
vert->strength = (round_cap0) ? pt->strength : -pt->strength;
vert->u_stroke = pt->uv_fac;
More information about the Bf-blender-cvs
mailing list