From dcec99734b4ca63995e16e0cdd92b9ee1dbed787 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 14 Apr 2014 17:56:04 +0600 Subject: Fix for the eyedropper fixes from today Missing color copy, noticed by @campbellbarton, thanks! --- source/blender/editors/space_clip/clip_editor.c | 1 + source/blender/editors/space_node/node_view.c | 1 + 2 files changed, 2 insertions(+) (limited to 'source/blender/editors') diff --git a/source/blender/editors/space_clip/clip_editor.c b/source/blender/editors/space_clip/clip_editor.c index 7b8d659d857..4fe12fdd7e9 100644 --- a/source/blender/editors/space_clip/clip_editor.c +++ b/source/blender/editors/space_clip/clip_editor.c @@ -295,6 +295,7 @@ bool ED_space_clip_color_sample(Scene *scene, SpaceClip *sc, ARegion *ar, int mv } else if (ibuf->rect) { cp = (unsigned char *)(ibuf->rect + y * ibuf->x + x); + rgb_uchar_to_float(r_col, cp); IMB_colormanagement_colorspace_to_scene_linear_v3(r_col, ibuf->rect_colorspace); ret = true; } diff --git a/source/blender/editors/space_node/node_view.c b/source/blender/editors/space_node/node_view.c index 24aa6fa8cbe..59b942e5eb4 100644 --- a/source/blender/editors/space_node/node_view.c +++ b/source/blender/editors/space_node/node_view.c @@ -465,6 +465,7 @@ bool ED_space_node_color_sample(Scene *scene, SpaceNode *snode, ARegion *ar, int } else if (ibuf->rect) { cp = (unsigned char *)(ibuf->rect + y * ibuf->x + x); + rgb_uchar_to_float(r_col, cp); IMB_colormanagement_colorspace_to_scene_linear_v3(r_col, ibuf->rect_colorspace); ret = true; } -- cgit v1.2.3