diff options
author | Hans Goudey <h.goudey@me.com> | 2021-08-27 07:41:41 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2021-08-27 07:41:41 +0300 |
commit | a0f754e7749a485c97718433edbbab5ac76cdc7a (patch) | |
tree | d968d66e73be6dbac5997a3f5bb8e33e462c96d3 /source/blender/editors/interface/interface_eyedropper_intern.h | |
parent | 137a5e162c2435662dbb299ff49771e7d2e7598f (diff) | |
parent | 523bc981cfeecead5050e7af44bbe252c166d718 (diff) |
Merge branch 'master' into refactor-idprop-ui-datarefactor-idprop-ui-data
Diffstat (limited to 'source/blender/editors/interface/interface_eyedropper_intern.h')
-rw-r--r-- | source/blender/editors/interface/interface_eyedropper_intern.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface_eyedropper_intern.h b/source/blender/editors/interface/interface_eyedropper_intern.h index 96a2c6ed111..f9f3fcfb5d1 100644 --- a/source/blender/editors/interface/interface_eyedropper_intern.h +++ b/source/blender/editors/interface/interface_eyedropper_intern.h @@ -24,10 +24,13 @@ /* interface_eyedropper.c */ void eyedropper_draw_cursor_text_window(const struct wmWindow *window, const char *name); -void eyedropper_draw_cursor_text_region(const struct bContext *C, - const struct ARegion *region, - const char *name); +void eyedropper_draw_cursor_text_region(const int x, const int y, const char *name); uiBut *eyedropper_get_property_button_under_mouse(bContext *C, const wmEvent *event); +void datadropper_win_area_find(const struct bContext *C, + const int mval[2], + int r_mval[2], + struct wmWindow **r_win, + struct ScrArea **r_area); /* interface_eyedropper_color.c (expose for color-band picker) */ void eyedropper_color_sample_fl(bContext *C, int mx, int my, float r_col[3]); |