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

Fix T53810: Crash removing a scene used in render

Browse Source 
Header drawing accesses the scene too.
This commit is contained in:
Campbell Barton
2018-01-17 10:00:14 +11:00
parent 9d1ae07d4f
commit a19e3bdad8
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
source/blender/editors/space_image/space_image.c
View File

@@ -89,6 +89,18 @@ static void image_scopes_tag_refresh(ScrArea *sa)
sima->scopes.ok = 0; sima->scopes.ok = 0;
} }
static void image_user_refresh_scene(const bContext *C, SpaceImage *sima)
{
if (sima->image && sima->image->type == IMA_TYPE_R_RESULT) {
/* for render result, try to use the currently rendering scene */
Scene *render_scene = ED_render_job_get_current_scene(C);
if (render_scene) {
sima->iuser.scene = render_scene;
return;
}
}
sima->iuser.scene = CTX_data_scene(C);
}
/* ******************** manage regions ********************* */ /* ******************** manage regions ********************* */
@@ -699,17 +711,7 @@ static void image_main_region_draw(const bContext *C, ARegion *ar)
glClearColor(col[0], col[1], col[2], 0.0); glClearColor(col[0], col[1], col[2], 0.0);
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
/* put scene context variable in iuser */ image_user_refresh_scene(C, sima);
if (sima->image && sima->image->type == IMA_TYPE_R_RESULT) {
/* for render result, try to use the currently rendering scene */
Scene *render_scene = ED_render_job_get_current_scene(C);
if (render_scene)
sima->iuser.scene = render_scene;
else
sima->iuser.scene = scene;
}
else
sima->iuser.scene = scene;
/* we set view2d from own zoom and offset each time */ /* we set view2d from own zoom and offset each time */
image_main_region_set_view2d(sima, ar); image_main_region_set_view2d(sima, ar);
@@ -961,6 +963,11 @@ static void image_header_region_init(wmWindowManager *UNUSED(wm), ARegion *ar)
static void image_header_region_draw(const bContext *C, ARegion *ar) static void image_header_region_draw(const bContext *C, ARegion *ar)
{ {
ScrArea *sa = CTX_wm_area(C);
SpaceImage *sima = sa->spacedata.first;
image_user_refresh_scene(C, sima);
ED_region_header(C, ar); ED_region_header(C, ar);
} }