diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-02-19 21:47:09 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-02-19 21:47:09 +0300 |
| commit | 8a7b984e7a9b7c93e8b1f2faacc18a4fb7bfc0bf (patch) | |
| tree | 956214ac2b4ddd02f911717777808ac08278be26 /source/blender/src | |
| parent | 97d40faee9b3ec0c40cbe460a1f60ba713af6b6a (diff) | |
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.
Diffstat (limited to 'source/blender/src')
| -rw-r--r-- | source/blender/src/space.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/src/space.c b/source/blender/src/space.c index f39772c391b..a586d1e0e36 100644 --- a/source/blender/src/space.c +++ b/source/blender/src/space.c @@ -5101,15 +5101,7 @@ static void winqreadimagespace(ScrArea *sa, void *spacedata, BWinEvent *evt) 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 @@ static void winqreadimagespace(ScrArea *sa, void *spacedata, BWinEvent *evt) } } 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) { |