[Bf-blender-cvs] [59310a92592] greasepencil-object: Fix: When adding 2D Monkey, the Palette got too many users assigned

Joshua Leung noreply at git.blender.org
Wed Oct 4 14:17:31 CEST 2017


Commit: 59310a92592fb82c891c194ce55ecdba854d6314
Author: Joshua Leung
Date:   Thu Oct 5 00:51:00 2017 +1300
Branches: greasepencil-object
https://developer.blender.org/rB59310a92592fb82c891c194ce55ecdba854d6314

Fix: When adding 2D Monkey, the Palette got too many users assigned

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

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

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

diff --git a/source/blender/editors/gpencil/gpencil_add_monkey.c b/source/blender/editors/gpencil/gpencil_add_monkey.c
index 26a4ec83da1..8f0c9f9a1ba 100644
--- a/source/blender/editors/gpencil/gpencil_add_monkey.c
+++ b/source/blender/editors/gpencil/gpencil_add_monkey.c
@@ -1356,6 +1356,10 @@ void ED_gpencil_create_monkey(bContext *C, bGPdata *gpd)
 	/* create palette and colors */
 	Palette *palette = BKE_palette_add(bmain, "Monkey");
 	bGPDpaletteref *palslot = BKE_gpencil_paletteslot_add(gpd, palette);
+	
+	/* palette already had users when created, but assigning to palslot added an extra one... */
+	id_us_min(&palette->id);
+	
 
 	PaletteColor *color_Black = BKE_palette_color_add_name(palette, "Black");
 	ARRAY_SET_ITEMS(color_Black->rgb, 0.0f, 0.0f, 0.0f, 1.0f);



More information about the Bf-blender-cvs mailing list