blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

GPencil: Fix unreported problem filling textured strokes 

The internal image used for filling was not correct when the texture was used in stroke and this makes impossible get a right filling.
This commit is contained in:
Antonio Vazquez 2020-05-14 19:53:46 +02:00
parent 33ce0cb5a1
commit 5f31e5031c
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/editors/gpencil/gpencil_fill.c
View File

@ -295,18 +295,15 @@ static void gp_draw_datablock(tGPDfill *tgpf, const float ink[4])
tgpw.onion = true;
tgpw.custonion = true;
bool textured_stroke = (gp_style->stroke_style == GP_MATERIAL_STROKE_STYLE_TEXTURE);
/* normal strokes */
if (((tgpf->fill_draw_mode == GP_FILL_DMODE_STROKE) ||
(tgpf->fill_draw_mode == GP_FILL_DMODE_BOTH)) &&
!textured_stroke) {
if ((tgpf->fill_draw_mode == GP_FILL_DMODE_STROKE) ||
(tgpf->fill_draw_mode == GP_FILL_DMODE_BOTH)) {
ED_gp_draw_fill(&tgpw);
}
/* 3D Lines with basic shapes and invisible lines */
if ((tgpf->fill_draw_mode == GP_FILL_DMODE_CONTROL) ||
(tgpf->fill_draw_mode == GP_FILL_DMODE_BOTH) || textured_stroke) {
(tgpf->fill_draw_mode == GP_FILL_DMODE_BOTH)) {
gp_draw_basic_stroke(tgpf,
gps,
tgpw.diff_mat,