[Bf-blender-cvs] [b6d456b5de7] greasepencil-object: Fix error when delete all colors and redraw
Antonio Vazquez
noreply at git.blender.org
Sat Jan 27 18:35:11 CET 2018
Commit: b6d456b5de72ab8ec880a9ec5d27697556f8da3a
Author: Antonio Vazquez
Date: Sat Jan 27 18:35:03 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rBb6d456b5de72ab8ec880a9ec5d27697556f8da3a
Fix error when delete all colors and redraw
When delete all colors and draw again, the color index was wrong.
===================================================================
M source/blender/blenkernel/intern/gpencil.c
===================================================================
diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index 124f221f4cf..47554c533d7 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -1700,7 +1700,7 @@ bGPDpaletteref *BKE_gpencil_paletteslot_validate(Main *bmain, bGPdata *gpd)
/* sanity checks */
if (ELEM(NULL, bmain, gpd))
return NULL;
-
+
/* ensure a palette slot exists */
palslot = BKE_gpencil_paletteslot_get_active(gpd);
if (palslot == NULL) {
@@ -1724,6 +1724,7 @@ bGPDpaletteref *BKE_gpencil_paletteslot_validate(Main *bmain, bGPdata *gpd)
if (BKE_palette_is_empty(palette)) {
/* init the default set if none exist */
BKE_palette_color_add_default_set(palette);
+ palette->active_color = 0;
}
else if (BKE_palette_color_get_active(palette) == NULL) {
/* sometimes the "active" color is unreachable
More information about the Bf-blender-cvs
mailing list