Commit: b8be8f54dfaa417d8748c9cf0d9084baa2809707
Author: Antonio Vazquez
Date: Thu Aug 22 16:46:58 2019 +0200
Branches: greasepencil-object
https://developer.blender.org/rBb8be8f54dfaa417d8748c9cf0d9084baa2809707
GPencil: Verify duplicate SVG materials only for SOLID
For gradient types, each color is a different material.
===================================================================
M source/blender/blenkernel/intern/gpencil.c
===================================================================
diff --git a/source/blender/blenkernel/intern/gpencil.c
b/source/blender/blenkernel/intern/gpencil.c
index e8b028edd1c..2482496a13d 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -2850,7 +2850,7 @@ static int gpencil_check_same_material_color(Object
*ob_gp, float color[4], Mate
float hsv2[4];
rgb_to_hsv_v(gp_style->fill_rgba, hsv2);
hsv2[3] = gp_style->fill_rgba[3];
- if (compare_v4v4(hsv1, hsv2, 0.01f)) {
+ if ((gp_style->fill_style == GP_STYLE_FILL_STYLE_SOLID) &&
(compare_v4v4(hsv1, hsv2, 0.01f))) {
r_mat = ma;
return i - 1;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
