[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32264] trunk/blender/source/blender: Fix #22348: disabled image editor curves on non-float images, this never
Brecht Van Lommel
brechtvanlommel at pandora.be
Sat Oct 2 21:31:58 CEST 2010
Revision: 32264
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32264
Author: blendix
Date: 2010-10-02 21:31:58 +0200 (Sat, 02 Oct 2010)
Log Message:
-----------
Fix #22348: disabled image editor curves on non-float images, this never
worked correct, only got enabled accidentally in 2.5 port.
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_image/image_buttons.c
trunk/blender/source/blender/editors/space_image/image_ops.c
trunk/blender/source/blender/makesrna/intern/rna_space.c
Modified: trunk/blender/source/blender/editors/space_image/image_buttons.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/image_buttons.c 2010-10-02 19:31:23 UTC (rev 32263)
+++ trunk/blender/source/blender/editors/space_image/image_buttons.c 2010-10-02 19:31:58 UTC (rev 32264)
@@ -303,8 +303,15 @@
static int image_panel_poll(const bContext *C, PanelType *pt)
{
SpaceImage *sima= CTX_wm_space_image(C);
+ ImBuf *ibuf;
+ void *lock;
+ int result;
+
+ ibuf= ED_space_image_acquire_buffer(sima, &lock);
+ result= ibuf && ibuf->rect_float;
+ ED_space_image_release_buffer(sima, lock);
- return ED_space_image_has_buffer(sima);
+ return result;
}
static void image_panel_curves(const bContext *C, Panel *pa)
Modified: trunk/blender/source/blender/editors/space_image/image_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/image_ops.c 2010-10-02 19:31:23 UTC (rev 32263)
+++ trunk/blender/source/blender/editors/space_image/image_ops.c 2010-10-02 19:31:58 UTC (rev 32264)
@@ -1656,11 +1656,13 @@
if(point == 1) {
curvemapping_set_black_white(sima->cumap, NULL, info->colfp);
- curvemapping_do_ibuf(sima->cumap, ibuf);
+ if(ibuf->rect_float)
+ curvemapping_do_ibuf(sima->cumap, ibuf);
}
else if(point == 0) {
curvemapping_set_black_white(sima->cumap, info->colfp, NULL);
- curvemapping_do_ibuf(sima->cumap, ibuf);
+ if(ibuf->rect_float)
+ curvemapping_do_ibuf(sima->cumap, ibuf);
}
}
}
Modified: trunk/blender/source/blender/makesrna/intern/rna_space.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_space.c 2010-10-02 19:31:23 UTC (rev 32263)
+++ trunk/blender/source/blender/makesrna/intern/rna_space.c 2010-10-02 19:31:58 UTC (rev 32264)
@@ -477,7 +477,8 @@
void *lock;
ibuf= ED_space_image_acquire_buffer(sima, &lock);
- curvemapping_do_ibuf(sima->cumap, ibuf);
+ if(ibuf->rect_float)
+ curvemapping_do_ibuf(sima->cumap, ibuf);
ED_space_image_release_buffer(sima, lock);
WM_main_add_notifier(NC_IMAGE, sima->image);
More information about the Bf-blender-cvs
mailing list