archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

StudioLight: Fix crash when closing blender

Browse Source 
The studiolight was being free after the window manager and was attempting
to stop the job again.
This commit is contained in:
Clément Foucault
2018-09-18 15:35:51 +02:00
parent a1a58c8d0a
commit 32e6d5cd6f
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/editors/interface/interface_icons.c
View File

@@ -1051,6 +1051,10 @@ static void ui_studiolight_free_function(StudioLight *sl, void *data)
{ {
wmWindowManager *wm = data; wmWindowManager *wm = data;
/* Happens if job was canceled or already finished. */
if (wm == NULL)
return;
// get icons_id, get icons and kill wm jobs // get icons_id, get icons and kill wm jobs
if (sl->icon_id_radiance) { if (sl->icon_id_radiance) {
ui_studiolight_kill_icon_preview_job(wm, sl->icon_id_radiance); ui_studiolight_kill_icon_preview_job(wm, sl->icon_id_radiance);
@@ -1066,6 +1070,14 @@ static void ui_studiolight_free_function(StudioLight *sl, void *data)
} }
} }
static void ui_studiolight_icon_job_end(void *customdata)
{
Icon **tmp = (Icon **)customdata;
Icon *icon = *tmp;
StudioLight *sl = icon->obj;
BKE_studiolight_set_free_function(sl, &ui_studiolight_free_function, NULL);
}
void ui_icon_ensure_deferred(const bContext *C, const int icon_id, const bool big) void ui_icon_ensure_deferred(const bContext *C, const int icon_id, const bool big)
{ {
Icon *icon = BKE_icon_get(icon_id); Icon *icon = BKE_icon_get(icon_id);
@@ -1113,7 +1125,7 @@ void ui_icon_ensure_deferred(const bContext *C, const int icon_id, const bool bi
*tmp = icon; *tmp = icon;
WM_jobs_customdata_set(wm_job, tmp, MEM_freeN); WM_jobs_customdata_set(wm_job, tmp, MEM_freeN);
WM_jobs_timer(wm_job, 0.01, 0, NC_WINDOW); WM_jobs_timer(wm_job, 0.01, 0, NC_WINDOW);
WM_jobs_callbacks(wm_job, ui_studiolight_icon_job_exec, NULL, NULL, NULL); WM_jobs_callbacks(wm_job, ui_studiolight_icon_job_exec, NULL, NULL, ui_studiolight_icon_job_end);
WM_jobs_start(CTX_wm_manager(C), wm_job); WM_jobs_start(CTX_wm_manager(C), wm_job);
} }
} }