Commit: 7c04d497efc043328d3e4c48a006c0d1f4700dee
Author: Antony Riakiotakis
Date: Thu Jul 3 15:47:09 2014 +0300
https://developer.blender.org/rB7c04d497efc043328d3e4c48a006c0d1f4700dee
Color management tweaks
===================================================================
M source/blender/editors/interface/interface_handlers.c
M source/blender/editors/interface/interface_ops.c
===================================================================
diff --git a/source/blender/editors/interface/interface_handlers.c
b/source/blender/editors/interface/interface_handlers.c
index c2b0d7f..2017617 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -4087,8 +4087,7 @@ static int ui_do_but_BLOCK(bContext *C, uiBut *but,
uiHandleButtonData *data, co
}
}
#ifdef USE_DRAG_TOGGLE
- if (event->type == LEFTMOUSE && event->val == KM_PRESS &&
(ui_is_but_drag_toggle(but)))
- {
+ if (event->type == LEFTMOUSE && event->val == KM_PRESS &&
(ui_is_but_drag_toggle(but))) {
button_activate_state(C, but, BUTTON_STATE_WAIT_DRAG);
data->dragstartx = event->x;
data->dragstarty = event->y;
@@ -4326,8 +4325,8 @@ static int ui_do_but_COLOR(bContext *C, uiBut *but,
uiHandleButtonData *data, co
float *target =
&brush->gradient->data[brush->gradient->cur].r;
if (but->rnaprop &&
RNA_property_subtype(but->rnaprop) == PROP_COLOR_GAMMA) {
-
RNA_property_float_get_array(&but->rnapoin, but->rnaprop, color);
- srgb_to_linearrgb_v3_v3(target,
color);
+
RNA_property_float_get_array(&but->rnapoin, but->rnaprop, target);
+
ui_block_to_scene_linear_v3(but->block, target);
}
else if (but->rnaprop &&
RNA_property_subtype(but->rnaprop) == PROP_COLOR) {
RNA_property_float_get_array(&but->rnapoin, but->rnaprop, target);
@@ -4339,9 +4338,8 @@ static int ui_do_but_COLOR(bContext *C, uiBut *but,
uiHandleButtonData *data, co
BKE_brush_color_set(scene,
brush, color);
}
else if (but->rnaprop &&
RNA_property_subtype(but->rnaprop) == PROP_COLOR) {
- float color[3];
RNA_property_float_get_array(&but->rnapoin, but->rnaprop, color);
- linearrgb_to_srgb_v3_v3(color,
color);
+
ui_block_to_display_space_v3(but->block, color);
BKE_brush_color_set(scene,
brush, color);
}
}
diff --git a/source/blender/editors/interface/interface_ops.c
b/source/blender/editors/interface/interface_ops.c
index 292fdf5..a97145f 100644
--- a/source/blender/editors/interface/interface_ops.c
+++ b/source/blender/editors/interface/interface_ops.c
@@ -860,13 +860,13 @@ static int drop_color_invoke(bContext *C, wmOperator *op,
const wmEvent *UNUSED(
if (but && but->type == COLOR && but->rnaprop) {
if (RNA_property_subtype(but->rnaprop) == PROP_COLOR_GAMMA) {
if (!gamma)
- linearrgb_to_srgb_v3_v3(color, color);
+ ui_block_to_display_space_v3(but->block, color);
RNA_property_float_set_array(&but->rnapoin,
but->rnaprop, color);
RNA_property_update(C, &but->rnapoin, but->rnaprop);
}
else if (RNA_property_subtype(but->rnaprop) == PROP_COLOR) {
if (gamma)
- srgb_to_linearrgb_v3_v3(color, color);
+ ui_block_to_scene_linear_v3(but->block, color);
RNA_property_float_set_array(&but->rnapoin,
but->rnaprop, color);
RNA_property_update(C, &but->rnapoin, but->rnaprop);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
