diff options
| author | Jeroen Bakker <jeroen@blender.org> | 2020-11-12 11:14:36 +0300 |
|---|---|---|
| committer | Jeroen Bakker <jeroen@blender.org> | 2020-11-12 11:14:36 +0300 |
| commit | 08452d995664f6e5605d282374746c305f28fa52 (patch) | |
| tree | bae7ed9420d0ff051db866f326f92721f7184f5c /source/blender/editors/interface | |
| parent | cd2dfacfa574f99acb06c0d020d96b2be714aa20 (diff) | |
| parent | c08827e659e5f48034b4f9d4612bd309ea63ff03 (diff) | |
Merge branch 'blender-v2.91-release'
Diffstat (limited to 'source/blender/editors/interface')
| -rw-r--r-- | source/blender/editors/interface/interface_eyedropper_color.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_eyedropper_color.c b/source/blender/editors/interface/interface_eyedropper_color.c index c86e35f91db..5af290db037 100644 --- a/source/blender/editors/interface/interface_eyedropper_color.c +++ b/source/blender/editors/interface/interface_eyedropper_color.c @@ -163,7 +163,7 @@ void eyedropper_color_sample_fl(bContext *C, int mx, int my, float r_col[3]) SpaceImage *sima = area->spacedata.first; int mval[2] = {mx - region->winrct.xmin, my - region->winrct.ymin}; - if (ED_space_image_color_sample(sima, region, mval, r_col)) { + if (ED_space_image_color_sample(sima, region, mval, r_col, NULL)) { return; } } |