Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-01-25 08:28:06 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-01-25 08:32:43 +0300
commit38dafd5f44a07b4937ca53cf67cce4093d5797f7 (patch)
tree02612f48da66659340d3fd5b7ebd514502fd8e29 /source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c
parent032129ef3527424de241f381376a3b94a2247965 (diff)
parent693b41eb17557ba12e7c64c5ba589c499ff45c4d (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c')
-rw-r--r--source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c b/source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c
index 354fd32cbd6..0e63f3d6ffe 100644
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c
+++ b/source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c
@@ -500,7 +500,7 @@ static int manipulator_tweak_invoke(bContext *C, wmOperator *op, const wmEvent *
wmManipulator *mpr = mmap->mmap_context.highlight;
/* Needed for single click actions which don't enter modal state. */
- WM_manipulatormap_tooltip_clear(C, mmap);
+ WM_tooltip_clear(C, CTX_wm_window(C));
if (!mpr) {
/* wm_handlers_do_intern shouldn't let this happen */