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>2012-09-28 08:00:06 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-09-28 08:00:06 +0400
commitd732e05740088165001f92b1c65b4fa70dc20f29 (patch)
treeb73ff50ef78960384ef95516830a6436a819636e /source/blender/windowmanager
parente1897f8c4adedac01fc00e0514cb22054106ed58 (diff)
fix for header not updating with an error report when a job finishes.
was reported as a reply to [#32537], but is a different issue then the original report.
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r--source/blender/windowmanager/WM_api.h1
-rw-r--r--source/blender/windowmanager/intern/wm_event_system.c5
-rw-r--r--source/blender/windowmanager/intern/wm_jobs.c6
3 files changed, 11 insertions, 1 deletions
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h
index 9570638fb25..ac05331095b 100644
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@ -155,6 +155,7 @@ struct wmEventHandler *WM_event_add_dropbox_handler(ListBase *handlers, ListBase
/* mouse */
void WM_event_add_mousemove(struct bContext *C);
+void WM_event_add_mousemove_window(struct wmWindow *window);
int WM_modal_tweak_exit(struct wmEvent *evt, int tweak_event);
/* notifiers */
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index 13daddeb399..2f238cd22e7 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -2472,6 +2472,11 @@ void WM_event_add_mousemove(bContext *C)
window->addmousemove = 1;
}
+void WM_event_add_mousemove_window(wmWindow *window)
+{
+ window->addmousemove = 1;
+}
+
/* for modal callbacks, check configuration for how to interpret exit with tweaks */
int WM_modal_tweak_exit(wmEvent *evt, int tweak_event)
{
diff --git a/source/blender/windowmanager/intern/wm_jobs.c b/source/blender/windowmanager/intern/wm_jobs.c
index e3d6b0f73e1..4a410363167 100644
--- a/source/blender/windowmanager/intern/wm_jobs.c
+++ b/source/blender/windowmanager/intern/wm_jobs.c
@@ -492,7 +492,11 @@ void wm_jobs_timer(const bContext *C, wmWindowManager *wm, wmTimer *wt)
WM_event_add_notifier(C, wm_job->endnote, NULL);
WM_event_add_notifier(C, NC_WM | ND_JOB, NULL);
-
+
+ /* so the info header updates on job end even if the mouse doesn't move.
+ * a rather annoying/obscure bug, see [#32537] (second reply) */
+ WM_event_add_mousemove_window(wm_job->win);
+
/* new job added for wm_job? */
if (wm_job->customdata) {
// printf("job restarted with new data %s\n", wm_job->name);