[Bf-blender-cvs] [35bb81656f3] greasepencil-object: GPencil: Fix error with Stencil Strokes when convert to Vertex
Antonio Vazquez
noreply at git.blender.org
Sat Nov 16 20:50:46 CET 2019
Commit: 35bb81656f37755067b8e58789c101c117901bc5
Author: Antonio Vazquez
Date: Sat Nov 16 20:50:41 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rB35bb81656f37755067b8e58789c101c117901bc5
GPencil: Fix error with Stencil Strokes when convert to Vertex
===================================================================
M source/blender/editors/gpencil/gpencil_vertex_ops.c
===================================================================
diff --git a/source/blender/editors/gpencil/gpencil_vertex_ops.c b/source/blender/editors/gpencil/gpencil_vertex_ops.c
index 0a52d7cecbc..33975c398cb 100644
--- a/source/blender/editors/gpencil/gpencil_vertex_ops.c
+++ b/source/blender/editors/gpencil/gpencil_vertex_ops.c
@@ -620,7 +620,7 @@ static bool gp_extract_palette(bContext *C, const bool selected, const int thres
/* Only solid strokes or stencil. */
if ((use_stroke) && ((gp_style->stroke_style == GP_STYLE_STROKE_STYLE_TEXTURE) &&
- ((gp_style->flag & GP_STYLE_FILL_PATTERN) == 0))) {
+ ((gp_style->flag & GP_STYLE_STROKE_PATTERN) == 0))) {
continue;
}
@@ -807,7 +807,7 @@ static int gp_material_to_vertex_exec(bContext *C, wmOperator *op)
/* Only solid strokes or stencil. */
if ((use_stroke) && ((gp_style->stroke_style == GP_STYLE_STROKE_STYLE_TEXTURE) &&
- ((gp_style->flag & GP_STYLE_FILL_PATTERN) == 0))) {
+ ((gp_style->flag & GP_STYLE_STROKE_PATTERN) == 0))) {
continue;
}
@@ -861,7 +861,7 @@ static int gp_material_to_vertex_exec(bContext *C, wmOperator *op)
mat_elm->key = key;
mat_elm->ma = ma;
- mat_elm->sima = gp_style->ima;
+ mat_elm->sima = gp_style->sima;
mat_elm->index = ob->totcol - 1;
}
else {
More information about the Bf-blender-cvs
mailing list