diff options
| author | Hans Goudey <h.goudey@me.com> | 2020-09-01 20:35:14 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2020-09-01 20:38:05 +0300 |
| commit | baca8611e5fe4b3dcd6f5065fb125bc0a9d65934 (patch) | |
| tree | bb1230387cd53b15f9621f10c4d0e5e2050b5580 /source/blender/editors/interface/interface_eyedropper_gpencil_color.c | |
| parent | 31705201dddebf7e3be5c4533b89f380aad1ede1 (diff) | |
| parent | 2930d4fcea405985f2212c5f28c061af7c4849f8 (diff) | |
Merge branch 'master' into active-fcurve-keyframeactive-fcurve-keyframe
Diffstat (limited to 'source/blender/editors/interface/interface_eyedropper_gpencil_color.c')
| -rw-r--r-- | source/blender/editors/interface/interface_eyedropper_gpencil_color.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_eyedropper_gpencil_color.c b/source/blender/editors/interface/interface_eyedropper_gpencil_color.c index aa5b4d2c255..f7c41a7142b 100644 --- a/source/blender/editors/interface/interface_eyedropper_gpencil_color.c +++ b/source/blender/editors/interface/interface_eyedropper_gpencil_color.c @@ -38,6 +38,7 @@ #include "BKE_context.h" #include "BKE_gpencil.h" +#include "BKE_lib_id.h" #include "BKE_main.h" #include "BKE_material.h" #include "BKE_paint.h" @@ -208,9 +209,13 @@ static void eyedropper_add_palette_color(bContext *C, const float col_conv[4]) /* Check for Palette in Draw and Vertex Paint Mode. */ if (paint->palette == NULL) { - paint->palette = BKE_palette_add(bmain, "Grease Pencil"); + Palette *palette = BKE_palette_add(bmain, "Grease Pencil"); + id_us_min(&palette->id); + + BKE_paint_palette_set(paint, palette); + if (vertexpaint->palette == NULL) { - vertexpaint->palette = paint->palette; + BKE_paint_palette_set(vertexpaint, palette); } } /* Check if the color exist already. */ |