[Bf-blender-cvs] [00fc604478c] master: Fix T61570: Monkey primitive fill color wrong

[Antonioya]

Commit: 00fc604478c7a5e71406e5cd63f162ce11debe11
Author: Antonioya
Date:   Fri Feb 15 12:00:43 2019 +0100
Branches: master
https://developer.blender.org/rB00fc604478c7a5e71406e5cd63f162ce11debe11

Fix T61570: Monkey primitive fill color wrong

This was introduced by error in a previous commit.

===================================================================

M       source/blender/editors/gpencil/gpencil_add_monkey.c
M       source/blender/editors/gpencil/gpencil_add_stroke.c

===================================================================

diff --git a/source/blender/editors/gpencil/gpencil_add_monkey.c 
b/source/blender/editors/gpencil/gpencil_add_monkey.c
index ec5dc1e2917..dfe61e2a456 100644
--- a/source/blender/editors/gpencil/gpencil_add_monkey.c
+++ b/source/blender/editors/gpencil/gpencil_add_monkey.c
@@ -73,6 +73,9 @@ static int gpencil_monkey_color(
        if (!fill) {
                ma->gp_style->flag &= ~GP_STYLE_FILL_SHOW;
        }
+       else {
+               ma->gp_style->flag |= GP_STYLE_FILL_SHOW;
+       }
 
        return BKE_gpencil_get_material_index(ob, ma) - 1;
 }
diff --git a/source/blender/editors/gpencil/gpencil_add_stroke.c 
b/source/blender/editors/gpencil/gpencil_add_stroke.c
index 53dec964cf2..cc4e1f0fcc0 100644
--- a/source/blender/editors/gpencil/gpencil_add_stroke.c
+++ b/source/blender/editors/gpencil/gpencil_add_stroke.c
@@ -65,6 +65,10 @@ static int gp_stroke_material(Main *bmain, Object *ob, const 
ColorTemplate *pct)
        copy_v4_v4(ma->gp_style->stroke_rgba, pct->line);
        copy_v4_v4(ma->gp_style->fill_rgba, pct->fill);
 
+       if (pct->fill) {
+               ma->gp_style->flag |= GP_STYLE_FILL_SHOW;
+       }
+
        return BKE_gpencil_get_material_index(ob, ma) - 1;
 }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs