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:
authorTon Roosendaal <ton@blender.org>2013-05-17 20:46:59 +0400
committerTon Roosendaal <ton@blender.org>2013-05-17 20:46:59 +0400
commitc70a900736e28308600c5b3359070f38bc64daa6 (patch)
tree3d3226bc297414e1f4b729f330740921e48c748f /source/blender/windowmanager
parentbbec4c94f9819a8f4294fb31f190b63c2d6ce641 (diff)
More work on 3d view render:
- reverted fix for bug 32537 (error report drawing after thread job didn't show) This solves very bad 3d view render updates while using transform, it was getting into an eternal feedback loop for dependencies. (jobs sending mousemoves causing jobs to end, causing mousemoves, causing etc). - The render-update code was not going over all windows, but over every screen to send signals (also the invisble ones)
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.c6
-rw-r--r--source/blender/windowmanager/intern/wm_jobs.c4
3 files changed, 1 insertions, 10 deletions
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h
index 9830dcb9e9f..4e485ebfd63 100644
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@ -170,7 +170,6 @@ 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(const struct wmEvent *event, 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 03a1785541e..3a29685d059 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -2255,7 +2255,7 @@ void wm_event_do_handlers(bContext *C)
/* only add mousemove when queue was read entirely */
if (win->addmousemove && win->eventstate) {
wmEvent tevent = *(win->eventstate);
- //printf("adding MOUSEMOVE %d %d\n", tevent.x, tevent.y);
+ // printf("adding MOUSEMOVE %d %d\n", tevent.x, tevent.y);
tevent.type = MOUSEMOVE;
tevent.prevx = tevent.x;
tevent.prevy = tevent.y;
@@ -2540,10 +2540,6 @@ 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(const wmEvent *event, int tweak_event)
diff --git a/source/blender/windowmanager/intern/wm_jobs.c b/source/blender/windowmanager/intern/wm_jobs.c
index c637b77738e..03af5e9e8a6 100644
--- a/source/blender/windowmanager/intern/wm_jobs.c
+++ b/source/blender/windowmanager/intern/wm_jobs.c
@@ -529,10 +529,6 @@ void wm_jobs_timer(const bContext *C, wmWindowManager *wm, wmTimer *wt)
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);