[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14932] trunk/blender/source/blender/src/ header_image.c:
Brecht Van Lommel
brechtvanlommel at pandora.be
Thu May 22 19:32:16 CEST 2008
Revision: 14932
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14932
Author: blendix
Date: 2008-05-22 19:32:15 +0200 (Thu, 22 May 2008)
Log Message:
-----------
Fix for bug #11895: databrowse for image painting clone image didn't work.
Modified Paths:
--------------
trunk/blender/source/blender/src/header_image.c
Modified: trunk/blender/source/blender/src/header_image.c
===================================================================
--- trunk/blender/source/blender/src/header_image.c 2008-05-22 17:06:46 UTC (rev 14931)
+++ trunk/blender/source/blender/src/header_image.c 2008-05-22 17:32:15 UTC (rev 14932)
@@ -245,9 +245,24 @@
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:
More information about the Bf-blender-cvs
mailing list