[Bf-blender-cvs] [a36a49c] soc-2016-uv_tools: Add new packing to keymap and UV menu

[Phil Gosch]

Commit: a36a49c4e84e0c117a1ae77581a617f6898ab2ac
Author: Phil Gosch
Date:   Mon Aug 15 15:05:55 2016 +0200
Branches: soc-2016-uv_tools
https://developer.blender.org/rBa36a49c4e84e0c117a1ae77581a617f6898ab2ac

Add new packing to keymap and UV menu

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

M	release/scripts/startup/bl_ui/space_image.py
M	source/blender/editors/uvedit/uvedit_ops.c

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

diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py
index 4fce21a..5cfa702 100644
--- a/release/scripts/startup/bl_ui/space_image.py
+++ b/release/scripts/startup/bl_ui/space_image.py
@@ -361,6 +361,7 @@ class IMAGE_MT_uvs(Menu):
 
         layout.separator()
 
+        layout.operator("uv.irregular_pack_islands")
         layout.operator("uv.pack_islands")
         layout.operator("uv.average_islands_scale")
         layout.operator("uv.minimize_stretch")
diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c
index b499f70..7334ce8 100644
--- a/source/blender/editors/uvedit/uvedit_ops.c
+++ b/source/blender/editors/uvedit/uvedit_ops.c
@@ -4780,6 +4780,7 @@ void ED_keymap_uvedit(wmKeyConfig *keyconf)
 	WM_keymap_add_item(keymap, "UV_OT_unwrap", EKEY, KM_PRESS, 0, 0);
 	WM_keymap_add_item(keymap, "UV_OT_minimize_stretch", VKEY, KM_PRESS, KM_CTRL, 0);
 	WM_keymap_add_item(keymap, "UV_OT_pack_islands", PKEY, KM_PRESS, KM_CTRL, 0);
+	WM_keymap_add_item(keymap, "UV_OT_irregular_pack_islands", PKEY, KM_PRESS, KM_CTRL | KM_SHIFT, 0);
 	WM_keymap_add_item(keymap, "UV_OT_average_islands_scale", AKEY, KM_PRESS, KM_CTRL, 0);
 
 	/* hide */