Merging r58073 through r58111 from trunk into soc-2013-depsgraph_mt

2013-07-09 08:44:06 +00:00
parent 0bf3e7c5c6 80738a1828
commit 643d709d14
44 changed files with 856 additions and 317 deletions
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@ -404,6 +404,9 @@ void		WM_jobs_kill_type(struct wmWindowManager *wm, int job_type);

 int			WM_jobs_has_running(struct wmWindowManager *wm);

+void		WM_job_main_thread_lock_acquire(struct wmJob *job);
+void		WM_job_main_thread_lock_release(struct wmJob *job);
+
 			/* clipboard */
 char       *WM_clipboard_text_get(int selection);
 void        WM_clipboard_text_set(char *buf, int selection);