[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13770] trunk/blender/source/blender/src/ space.c:
Brecht Van Lommel
brechtvanlommel at pandora.be
Tue Feb 19 19:47:09 CET 2008
Revision: 13770
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13770
Author: blendix
Date: 2008-02-19 19:47:09 +0100 (Tue, 19 Feb 2008)
Log Message:
-----------
Fix for bug #8311: painting in the image editor with left mouse button
selection enabled still painted with right mouse button, inconsistent
with painting in the 3d view.
Modified Paths:
--------------
trunk/blender/source/blender/src/space.c
Modified: trunk/blender/source/blender/src/space.c
===================================================================
--- trunk/blender/source/blender/src/space.c 2008-02-19 18:44:40 UTC (rev 13769)
+++ trunk/blender/source/blender/src/space.c 2008-02-19 18:47:09 UTC (rev 13770)
@@ -5101,15 +5101,7 @@
if(val==0) return;
if(uiDoBlocks(&sa->uiblocks, event, 1)!=UI_NOTHING ) event= 0;
-
- if (U.flag & USER_LMOUSESELECT) {
- if (event == LEFTMOUSE) {
- event = RIGHTMOUSE;
- } else if (event == RIGHTMOUSE) {
- event = LEFTMOUSE;
- }
- }
-
+
if (sima->image && (sima->flag & SI_DRAWTOOL)) {
switch(event) {
case CKEY:
@@ -5125,6 +5117,14 @@
}
}
else if (G.obedit) {
+ if (U.flag & USER_LMOUSESELECT) {
+ if (event == LEFTMOUSE) {
+ event = RIGHTMOUSE;
+ } else if (event == RIGHTMOUSE) {
+ event = LEFTMOUSE;
+ }
+ }
+
/* Draw tool is inactive, editmode is enabled and the image is not a render or composite */
if (EM_texFaceCheck() && (G.sima->image==0 || (G.sima->image->type != IMA_TYPE_R_RESULT && G.sima->image->type != IMA_TYPE_COMPOSITE))) {
switch(event) {
More information about the Bf-blender-cvs
mailing list