diff options
| author | Stefan Werner <stefan.werner@tangent-animation.com> | 2021-08-21 23:03:31 +0300 |
|---|---|---|
| committer | Stefan Werner <stefan.werner@tangent-animation.com> | 2021-08-21 23:03:31 +0300 |
| commit | c5b56a525cd6113caa2bd3ec7bfb91fe4a04513a (patch) | |
| tree | 77dae5ae2fbeccf6703034c94ad3e1f3aa81140b /source/blender/editors/include/UI_interface.h | |
| parent | 34e8d79c3edbc58fd242cec0c1f2bed4e43855af (diff) | |
| parent | 67c29bc5a273b66e278bd20c18187b425acf1869 (diff) | |
Merge branch 'master' into cycles_texture_cachecycles_texture_cache
Diffstat (limited to 'source/blender/editors/include/UI_interface.h')
| -rw-r--r-- | source/blender/editors/include/UI_interface.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h index a6e465d04e8..30be3588b5a 100644 --- a/source/blender/editors/include/UI_interface.h +++ b/source/blender/editors/include/UI_interface.h @@ -2577,10 +2577,7 @@ void ED_keymap_ui(struct wmKeyConfig *keyconf); void ED_uilisttypes_ui(void); void UI_drop_color_copy(struct wmDrag *drag, struct wmDropBox *drop); -bool UI_drop_color_poll(struct bContext *C, - struct wmDrag *drag, - const struct wmEvent *event, - const char **r_tooltip); +bool UI_drop_color_poll(struct bContext *C, struct wmDrag *drag, const struct wmEvent *event); bool UI_context_copy_to_selected_list(struct bContext *C, struct PointerRNA *ptr, |