[Bf-blender-cvs] [40e6d673d87] greasepencil-object: UI: Expand default palette color list

Antonio Vazquez noreply at git.blender.org
Sat Dec 9 19:34:58 CET 2017


Commit: 40e6d673d87ef0caef1ea3bc5abb82ce1e8a214d
Author: Antonio Vazquez
Date:   Sat Dec 9 19:34:49 2017 +0100
Branches: greasepencil-object
https://developer.blender.org/rB40e6d673d87ef0caef1ea3bc5abb82ce1e8a214d

UI: Expand default palette color list

The gray color was hidden.

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

M	release/scripts/startup/bl_ui/properties_material_gpencil.py
M	source/blender/editors/gpencil/gpencil_ops.c

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

diff --git a/release/scripts/startup/bl_ui/properties_material_gpencil.py b/release/scripts/startup/bl_ui/properties_material_gpencil.py
index 39dfc94643f..9c57f49fab3 100644
--- a/release/scripts/startup/bl_ui/properties_material_gpencil.py
+++ b/release/scripts/startup/bl_ui/properties_material_gpencil.py
@@ -95,7 +95,7 @@ class MATERIAL_PT_gpencil_palette_colors(Panel):
             row = layout.row()
             col = row.column()
             if len(palette.colors) >= 2:
-                color_rows = 5
+                color_rows = 6
             else:
                 color_rows = 2
             col.template_list("GPENCIL_UL_palettecolor", "", palette, "colors", palette, "active_index",
diff --git a/source/blender/editors/gpencil/gpencil_ops.c b/source/blender/editors/gpencil/gpencil_ops.c
index b739a2d9e4e..2fe9d9f30f9 100644
--- a/source/blender/editors/gpencil/gpencil_ops.c
+++ b/source/blender/editors/gpencil/gpencil_ops.c
@@ -396,6 +396,8 @@ static void ed_keymap_gpencil_editing(wmKeyConfig *keyconf)
 	kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_sculptmode_toggle", EKEY, KM_PRESS, 0, 0);
 	RNA_int_set(kmi->ptr, "back", 1);
 
+	/* menu vertex group */
+	WM_keymap_add_menu(keymap, "GPENCIL_MT_gpencil_vertex_group", GKEY, KM_PRESS, KM_CTRL, 0);
 }
 
 /* Stroke Painting Keymap - Only when paintmode is enabled */



More information about the Bf-blender-cvs mailing list