[Bf-blender-cvs] [7a0cc955cc0] master: Fix color picker cancel setting the color to black

[Campbell Barton]

Commit: 7a0cc955cc0b13e69412ff64b83bea1fcbbb9206
Author: Campbell Barton
Date:   Fri Jan 18 09:29:47 2019 +1100
Branches: master
https://developer.blender.org/rB7a0cc955cc0b13e69412ff64b83bea1fcbbb9206

Fix color picker cancel setting the color to black

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

M	source/blender/editors/interface/interface_eyedropper_color.c

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

diff --git a/source/blender/editors/interface/interface_eyedropper_color.c b/source/blender/editors/interface/interface_eyedropper_color.c
index 7bd98669a56..322d368dc27 100644
--- a/source/blender/editors/interface/interface_eyedropper_color.c
+++ b/source/blender/editors/interface/interface_eyedropper_color.c
@@ -100,22 +100,21 @@ static bool eyedropper_init(bContext *C, wmOperator *op)
 
 	eye->is_undo = UI_but_flag_is_set(but, UI_BUT_UNDO);
 
+	float col[4];
+	RNA_property_float_get_array(&eye->ptr, eye->prop, col);
 	if (RNA_property_subtype(eye->prop) != PROP_COLOR) {
 		Scene *scene = CTX_data_scene(C);
 		const char *display_device;
-		float col[4];
 
 		display_device = scene->display_settings.display_device;
 		eye->display = IMB_colormanagement_display_get_named(display_device);
 
 		/* store initial color */
-		RNA_property_float_get_array(&eye->ptr, eye->prop, col);
 		if (eye->display) {
 			IMB_colormanagement_display_to_scene_linear_v3(col, eye->display);
 		}
-		copy_v3_v3(eye->init_col, col);
 	}
-
+	copy_v3_v3(eye->init_col, col);
 
 	return true;
 }