Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2020-09-01 07:40:07 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-09-01 08:00:48 +0300
commita241948ad96be3a9cdf04a0ee53605d3ff4dd82b (patch)
tree8f8cce66ef3dfa19154f5497dc6c44f383b9137d /source/blender/editors/interface/interface_eyedropper_gpencil_color.c
parentd9d0a386cb02eec14fc8d167e9235fdd18a02c18 (diff)
Fix errors ensuring grease pencil palette
- Direct assignment caused ID user counts to be invalid. - The first palette would always be used, even when the named palette searched for was found. Also pass 'const' string to `hex_to_rgb`, avoid casting to 'non-const'.
Diffstat (limited to 'source/blender/editors/interface/interface_eyedropper_gpencil_color.c')
-rw-r--r--source/blender/editors/interface/interface_eyedropper_gpencil_color.c9
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. */