Merging r40653 through r40847 from trunk into soc-2011-tomato
[blender.git] / source / blender / editors / interface / interface_templates.c
index 4dcdeab..fa1b3ce 100644 (file)
@@ -2399,6 +2399,7 @@ void uiTemplateOperatorSearch(uiLayout *layout)
 #define B_STOPANIM             3
 #define B_STOPCOMPO            4
 #define B_STOPSEQ              5
+#define B_STOPCLIP             6
 
 static void do_running_jobs(bContext *C, void *UNUSED(arg), int event)
 {
@@ -2418,6 +2419,9 @@ static void do_running_jobs(bContext *C, void *UNUSED(arg), int event)
                case B_STOPSEQ:
                        WM_jobs_stop(CTX_wm_manager(C), CTX_wm_area(C), NULL);
                        break;
+               case B_STOPCLIP:
+                       WM_jobs_stop(CTX_wm_manager(C), CTX_wm_area(C), NULL);
+                       break;
        }
 }
 
@@ -2443,6 +2447,10 @@ void uiTemplateRunningJobs(uiLayout *layout, bContext *C)
                if(WM_jobs_test(wm, sa))
                        owner = sa;
                handle_event = B_STOPSEQ;
+       } else if(sa->spacetype==SPACE_CLIP) {
+               if(WM_jobs_test(wm, sa))
+                  owner = sa;
+               handle_event= B_STOPCLIP;
        } else {
                Scene *scene;
                /* another scene can be rendering too, for example via compositor */