diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-10-02 23:31:58 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-10-02 23:31:58 +0400 |
| commit | 77b75e23ba87122c78a361011e3fd09202ef85d8 (patch) | |
| tree | 175b1246912fe300c1a5e2079995a370ec39da4b /source/blender/editors/space_image/image_ops.c | |
| parent | a6e78239424fa735fd71dd03a4c9501aa6635d9a (diff) | |
Fix #22348: disabled image editor curves on non-float images, this never
worked correct, only got enabled accidentally in 2.5 port.
Diffstat (limited to 'source/blender/editors/space_image/image_ops.c')
| -rw-r--r-- | source/blender/editors/space_image/image_ops.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index df11d082c93..0bcc2439756 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -1656,11 +1656,13 @@ static void sample_apply(bContext *C, wmOperator *op, wmEvent *event) 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); } } } |