[Bf-blender-cvs] [dcec997] master: Fix for the eyedropper fixes from today

[Sergey Sharybin]

Commit: dcec99734b4ca63995e16e0cdd92b9ee1dbed787
Author: Sergey Sharybin
Date:   Mon Apr 14 17:56:04 2014 +0600
https://developer.blender.org/rBdcec99734b4ca63995e16e0cdd92b9ee1dbed787

Fix for the eyedropper fixes from today

Missing color copy, noticed by @campbellbarton, thanks!

===================================================================

M	source/blender/editors/space_clip/clip_editor.c
M	source/blender/editors/space_node/node_view.c

===================================================================

diff --git a/source/blender/editors/space_clip/clip_editor.c b/source/blender/editors/space_clip/clip_editor.c
index 7b8d659..4fe12fd 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 24aa6fa..59b942e 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;
 		}