diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-05-22 21:32:15 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-05-22 21:32:15 +0400 |
| commit | b7aeda4ff893a60981db0c9abd4072a0243d50d7 (patch) | |
| tree | bd567d6f569762fc00c6b1e10d3886741d0fbdcb | |
| parent | 7bae2af95c1b77fc3d91a988b7faa8f6130381fe (diff) | |
Fix for bug #11895: databrowse for image painting clone image didn't work.
| -rw-r--r-- | source/blender/src/header_image.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/source/blender/src/header_image.c b/source/blender/src/header_image.c index 341cce30c4e..7ac57cb839b 100644 --- a/source/blender/src/header_image.c +++ b/source/blender/src/header_image.c @@ -245,9 +245,24 @@ void do_image_buttons(unsigned short event) break; } case B_SIMACLONEBROWSE: - if (settings->imapaint.brush) - if (brush_clone_image_set_nr(settings->imapaint.brush, G.sima->menunr)) + if(settings->imapaint.brush) { + Brush *brush= settings->imapaint.brush; + + if(G.sima->menunr== -2) { + if(G.qual & LR_CTRLKEY) { + activate_databrowse_imasel((ID *)brush->clone.image, ID_IM, 0, B_SIMACLONEBROWSE, + &G.sima->menunr, do_image_buttons); + } else { + activate_databrowse((ID *)brush->clone.image, ID_IM, 0, B_SIMACLONEBROWSE, + &G.sima->menunr, do_image_buttons); + } + break; + } + if(G.sima->menunr < 0) break; + + if(brush_clone_image_set_nr(brush, G.sima->menunr)) allqueue(REDRAWIMAGE, 0); + } break; case B_SIMACLONEDELETE: |