Page MenuHome
Paste P571

Fix for D2886
ActivePublic
Actions

Authored by Sergey Sharybin (sergey) on Dec 6 2017, 4:00 PM.
diff --git a/source/blender/editors/interface/interface_eyedropper.c b/source/blender/editors/interface/interface_eyedropper.c
index 5e3ab20615c..9a062f0fd01 100644
--- a/source/blender/editors/interface/interface_eyedropper.c
+++ b/source/blender/editors/interface/interface_eyedropper.c
@@ -595,7 +595,7 @@ static bool eyedropper_colorband_sample_callback(int mx, int my, void *userdata)
return true;
}
-static void eyedropper_colorband_sample(bContext *C, EyedropperColorband *eye, int mx, int my)
+static void eyedropper_colorband_sample(bContext *UNUSED(C), EyedropperColorband *eye, int mx, int my)
{
/* since the mouse tends to move rather rapidly we use BLI_bitmap_draw_2d_line_v2v2i to */
/* interpolate between the reported coordinates */
@@ -619,9 +619,9 @@ static void eyedropper_colorband_exit(bContext *C, wmOperator *op)
static void eyedropper_colorband_apply_noresample(bContext *C, wmOperator *op)
{
EyedropperColorband *eye = (EyedropperColorband *)op->customdata;
- int stops = min(32, eye->color_buffer_index / 3);
+ int stops = min_ii(32, eye->color_buffer_index / 3);
if (stops) {
- float step = 1.0f / max(stops - 1, 1);
+ float step = 1.0f / max_ff(stops - 1, 1);
eye->band->tot = stops;
for (int i = 0; i < stops; i++) {
eye->band->data[i].r = eye->color_buffer[(i * 3)];

Event Timeline

Sergey Sharybin (sergey) created this paste.Dec 6 2017, 4:00 PM
Sergey Sharybin (sergey) created this object with edit policy "Administrators".
Sergey Sharybin (sergey) mentioned this in D2886: Add eyedropper to colorramp node..