5 files changed, 15 insertions, 16 deletions

diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h
index 482589e2ccb..3d4c84805f9 100644
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@ -744,8 +744,13 @@ void *WM_jobs_customdata_get(struct wmJob *);
 void WM_jobs_customdata_set(struct wmJob *, void *customdata, void (*free)(void *));
 void WM_jobs_timer(struct wmJob *, double timestep, unsigned int note, unsigned int endnote);
 void WM_jobs_delay_start(struct wmJob *, double delay_time);
+
+typedef void (*wm_jobs_start_callback)(void *custom_data,
+                                       short *stop,
+                                       short *do_update,
+                                       float *progress);
 void WM_jobs_callbacks(struct wmJob *,
-                       void (*startjob)(void *, short *, short *, float *),
+                       wm_jobs_start_callback startjob,
                        void (*initjob)(void *),
                        void (*update)(void *),
                        void (*endjob)(void *));
diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h
index 4acce793707..b4b3d0957af 100644
--- a/source/blender/windowmanager/WM_types.h
+++ b/source/blender/windowmanager/WM_types.h
@@ -361,6 +361,7 @@ typedef struct wmNotifier {
 #define ND_LOD (30 << 16)
 #define ND_DRAW_RENDER_VIEWPORT \
   (31 << 16) /* for camera & sequencer viewport update, also /w NC_SCENE */
+#define ND_SHADERFX (32 << 16)
 
 /* NC_MATERIAL Material */
 #define ND_SHADING (30 << 16)
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index 53d6df915d6..05ef4bfac30 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -591,7 +591,7 @@ static int wm_handler_ui_call(bContext *C,
     return WM_HANDLER_CONTINUE;
   }
 
-  /* UI is quite aggressive with swallowing events, like scrollwheel */
+  /* UI is quite aggressive with swallowing events, like scroll-wheel. */
   /* I realize this is not extremely nice code... when UI gets keymaps it can be maybe smarter */
   if (do_wheel_ui == false) {
     if (is_wheel) {
@@ -608,7 +608,7 @@ static int wm_handler_ui_call(bContext *C,
     return WM_UI_HANDLER_CONTINUE;
   }
 
-  /* we set context to where ui handler came from */
+  /* We set context to where UI handler came from. */
   if (handler->context.area) {
     CTX_wm_area_set(C, handler->context.area);
   }
@@ -810,7 +810,7 @@ bool WM_operator_check_ui_empty(wmOperatorType *ot)
     return true;
   }
 
-  /* Assume a ui callback will draw something. */
+  /* Assume a UI callback will draw something. */
   if (ot->ui) {
     return false;
   }
@@ -2707,7 +2707,7 @@ static int wm_handlers_do_intern(bContext *C, wmEvent *event, ListBase *handlers
        handler_base = handler_base_next) {
     handler_base_next = handler_base->next;
 
-    /* during this loop, ui handlers for nested menus can tag multiple handlers free */
+    /* During this loop, UI handlers for nested menus can tag multiple handlers free. */
     if (handler_base->flag & WM_HANDLER_DO_FREE) {
       /* pass */
     }
@@ -2829,7 +2829,7 @@ static int wm_handlers_do_intern(bContext *C, wmEvent *event, ListBase *handlers
 
     /* XXX code this for all modal ops, and ensure free only happens here */
 
-    /* modal ui handler can be tagged to be freed */
+    /* Modal UI handler can be tagged to be freed. */
     if (BLI_findindex(handlers, handler_base) !=
         -1) { /* could be freed already by regular modal ops */
       if (handler_base->flag & WM_HANDLER_DO_FREE) {
@@ -4834,7 +4834,7 @@ wmKeyMapItem *WM_event_match_keymap_item_from_handlers(bContext *C,
                                                        const wmEvent *event)
 {
   LISTBASE_FOREACH (wmEventHandler *, handler_base, handlers) {
-    /* during this loop, ui handlers for nested menus can tag multiple handlers free */
+    /* During this loop, UI handlers for nested menus can tag multiple handlers free. */
     if (handler_base->flag & WM_HANDLER_DO_FREE) {
       /* pass */
     }
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c
index d5a240a358e..f431a6f431b 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -1027,13 +1027,6 @@ void wm_homefile_read(bContext *C,
                                    },
                                    NULL);
     }
-    if (BLI_listbase_is_empty(&U.themes)) {
-      if (G.debug & G_DEBUG) {
-        printf("\nNote: No (valid) '%s' found, fall back to built-in default.\n\n",
-               filepath_startup);
-      }
-      success = false;
-    }
     if (success) {
       if (update_defaults) {
         if (use_data) {
diff --git a/source/blender/windowmanager/intern/wm_jobs.c b/source/blender/windowmanager/intern/wm_jobs.c
index c10f03f3dab..87a19d832c9 100644
--- a/source/blender/windowmanager/intern/wm_jobs.c
+++ b/source/blender/windowmanager/intern/wm_jobs.c
@@ -86,7 +86,7 @@ struct wmJob {
    * This performs the actual parallel work.
    * Executed in worker thread(s).
    */
-  void (*startjob)(void *, short *stop, short *do_update, float *progress);
+  wm_jobs_start_callback startjob;
   /**
    * Called if thread defines so (see `do_update` flag), and max once per timer step.
    * Executed in main thread.
@@ -378,7 +378,7 @@ void WM_jobs_delay_start(wmJob *wm_job, double delay_time)
 }
 
 void WM_jobs_callbacks(wmJob *wm_job,
-                       void (*startjob)(void *, short *, short *, float *),
+                       wm_jobs_start_callback startjob,
                        void (*initjob)(void *),
                        void (*update)(void *),
                        void (*endjob)(void *))