[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23321] trunk/blender: * Made image editor paint use predefined left/ right mouse buttons rather than action/select, consistent with 3d view painting (and better for tablets!)

[Matt Ebb]

Revision: 23321
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23321
Author:   broken
Date:     2009-09-18 04:19:27 +0200 (Fri, 18 Sep 2009)

Log Message:
-----------
* Made image editor paint use predefined left/right mouse buttons rather than action/select, consistent with 3d view painting (and better for tablets!)

* Fixed a small bug in project paint tool ui

Modified Paths:
--------------
    trunk/blender/release/ui/space_view3d_toolbar.py
    trunk/blender/source/blender/editors/space_image/space_image.c

Modified: trunk/blender/release/ui/space_view3d_toolbar.py
===================================================================
--- trunk/blender/release/ui/space_view3d_toolbar.py	2009-09-18 01:49:07 UTC (rev 23320)
+++ trunk/blender/release/ui/space_view3d_toolbar.py	2009-09-18 02:19:27 UTC (rev 23321)
@@ -599,7 +599,7 @@
 # ********** default tools for texturepaint ****************
 
 class VIEW3D_PT_tools_projectpaint(View3DPanel):
-	__context__ = "projectpaint"
+	__context__ = "texturepaint"
 	__label__ = "Project Paint"
 
 	def poll(self, context): 	 

Modified: trunk/blender/source/blender/editors/space_image/space_image.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/space_image.c	2009-09-18 01:49:07 UTC (rev 23320)
+++ trunk/blender/source/blender/editors/space_image/space_image.c	2009-09-18 02:19:27 UTC (rev 23321)
@@ -232,9 +232,9 @@
 	RNA_float_set(WM_keymap_add_item(keymap, "IMAGE_OT_view_zoom_ratio", PAD4, KM_PRESS, 0, 0)->ptr, "ratio", 0.25f);
 	RNA_float_set(WM_keymap_add_item(keymap, "IMAGE_OT_view_zoom_ratio", PAD8, KM_PRESS, 0, 0)->ptr, "ratio", 0.125f);
 
-	WM_keymap_add_item(keymap, "PAINT_OT_image_paint", ACTIONMOUSE, KM_PRESS, 0, 0);
-	WM_keymap_add_item(keymap, "PAINT_OT_grab_clone", SELECTMOUSE, KM_PRESS, 0, 0);
-	WM_keymap_add_item(keymap, "PAINT_OT_sample_color", SELECTMOUSE, KM_PRESS, 0, 0);
+	WM_keymap_add_item(keymap, "PAINT_OT_image_paint", LEFTMOUSE, KM_PRESS, 0, 0);
+	WM_keymap_add_item(keymap, "PAINT_OT_grab_clone", RIGHTMOUSE, KM_PRESS, 0, 0);
+	WM_keymap_add_item(keymap, "PAINT_OT_sample_color", RIGHTMOUSE, KM_PRESS, 0, 0);
 	RNA_enum_set(WM_keymap_add_item(keymap, "PAINT_OT_image_paint_radial_control", FKEY, KM_PRESS, 0, 0)->ptr, "mode", WM_RADIALCONTROL_SIZE);
 	RNA_enum_set(WM_keymap_add_item(keymap, "PAINT_OT_image_paint_radial_control", FKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "mode", WM_RADIALCONTROL_STRENGTH);