[Bf-blender-cvs] [2901986b10b] master: Fix T72252: crash running ocean bake in background mode
Brecht Van Lommel
noreply at git.blender.org
Sun Dec 8 14:02:49 CET 2019
Commit: 2901986b10bdaf12e050de18797f8a3e9d6a9a34
Author: Brecht Van Lommel
Date: Sun Dec 8 13:44:46 2019 +0100
Branches: master
https://developer.blender.org/rB2901986b10bdaf12e050de18797f8a3e9d6a9a34
Fix T72252: crash running ocean bake in background mode
===================================================================
M source/blender/windowmanager/intern/wm_window.c
===================================================================
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c
index fb0c60605a7..e68d4902c66 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -1885,12 +1885,17 @@ void WM_clipboard_text_set(const char *buf, bool selection)
void WM_progress_set(wmWindow *win, float progress)
{
- GHOST_SetProgressBar(win->ghostwin, progress);
+ /* In background mode we may have windows, but not actual GHOST windows. */
+ if (win->ghostwin) {
+ GHOST_SetProgressBar(win->ghostwin, progress);
+ }
}
void WM_progress_clear(wmWindow *win)
{
- GHOST_EndProgressBar(win->ghostwin);
+ if (win->ghostwin) {
+ GHOST_EndProgressBar(win->ghostwin);
+ }
}
/** \} */
More information about the Bf-blender-cvs
mailing list