Revision: 39514
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39514
Author: psy-fi
Date: 2011-08-17 23:04:06 +0000 (Wed, 17 Aug 2011)
Log Message:
-----------
uv paint brushes
=================
-keymap stuff
Modified Paths:
--------------
branches/soc-2011-onion/release/scripts/startup/bl_ui/space_userpref_keymap.py
branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2011-onion/source/blender/editors/space_image/space_image.c
branches/soc-2011-onion/source/blender/windowmanager/intern/wm_keymap.c
Modified:
branches/soc-2011-onion/release/scripts/startup/bl_ui/space_userpref_keymap.py
===================================================================
---
branches/soc-2011-onion/release/scripts/startup/bl_ui/space_userpref_keymap.py
2011-08-17 22:44:03 UTC (rev 39513)
+++
branches/soc-2011-onion/release/scripts/startup/bl_ui/space_userpref_keymap.py
2011-08-17 23:04:06 UTC (rev 39514)
@@ -73,6 +73,7 @@
('Image', 'IMAGE_EDITOR', 'WINDOW', [
('UV Editor', 'EMPTY', 'WINDOW', []), # image (reverse order, UVEdit
before Image
('Image Paint', 'EMPTY', 'WINDOW', []), # image and view3d
+ ('UV Paint', 'EMPTY', 'WINDOW', []),
('Image Generic', 'IMAGE_EDITOR', 'WINDOW', [])
]),
Modified:
branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_ops.c
===================================================================
--- branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_ops.c
2011-08-17 22:44:03 UTC (rev 39513)
+++ branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_ops.c
2011-08-17 23:04:06 UTC (rev 39514)
@@ -745,7 +745,7 @@
WM_keymap_add_item(keymap, "PAINT_OT_face_select_linked", LKEY,
KM_PRESS, KM_CTRL, 0);
WM_keymap_add_item(keymap, "PAINT_OT_face_select_linked_pick", LKEY,
KM_PRESS, 0, 0);
- keymap= WM_keymap_find(keyconf, "UV Smooth", 0, 0);
+ keymap= WM_keymap_find(keyconf, "UV Paint", 0, 0);
keymap->poll= uv_paint_poll;
WM_keymap_add_item(keymap, "PAINT_OT_uv_paint_stroke", LEFTMOUSE,
KM_PRESS, 0, 0);
Modified:
branches/soc-2011-onion/source/blender/editors/space_image/space_image.c
===================================================================
--- branches/soc-2011-onion/source/blender/editors/space_image/space_image.c
2011-08-17 22:44:03 UTC (rev 39513)
+++ branches/soc-2011-onion/source/blender/editors/space_image/space_image.c
2011-08-17 23:04:06 UTC (rev 39514)
@@ -759,7 +759,7 @@
keymap= WM_keymap_find(wm->defaultconf, "UV Editor", 0, 0);
WM_event_add_keymap_handler(&ar->handlers, keymap);
- keymap= WM_keymap_find(wm->defaultconf, "UV Smooth", 0, 0);
+ keymap= WM_keymap_find(wm->defaultconf, "UV Paint", 0, 0);
WM_event_add_keymap_handler(&ar->handlers, keymap);
/* own keymaps */
Modified:
branches/soc-2011-onion/source/blender/windowmanager/intern/wm_keymap.c
===================================================================
--- branches/soc-2011-onion/source/blender/windowmanager/intern/wm_keymap.c
2011-08-17 22:44:03 UTC (rev 39513)
+++ branches/soc-2011-onion/source/blender/windowmanager/intern/wm_keymap.c
2011-08-17 23:04:06 UTC (rev 39514)
@@ -857,6 +857,9 @@
case OB_MODE_TEXTURE_PAINT:
km = WM_keymap_find_all(C, "Image Paint", 0, 0);
break;
+ case OB_MODE_EDIT:
+ km = WM_keymap_find_all(C, "UV Paint", 0, 0);
+ break;
}
}
/* Paint Face Mask */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
