griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix color picker cancel setting the color to black

Browse Source
This commit is contained in:
Campbell Barton
2019-01-18 09:29:47 +11:00
parent 8efedf2523
commit 7a0cc955cc
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/editors/interface/interface_eyedropper_color.c
View File

@@ -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;
}