griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix [#36347] Blender crashes when clicking on 'render' in 'viewport shading'

Browse Source
This commit is contained in:
Campbell Barton
2013-08-20 18:55:41 +00:00
parent 5d97c93c08
commit e2534eac8e
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/editors/render/render_internal.c
View File

@@ -804,6 +804,11 @@ static bool render_view3d_get_rects(ARegion *ar, View3D *v3d, RegionView3D *rv3d
return true;
}
static bool render_view3d_is_valid(RenderPreview *rp)
{
return (rp->rv3d->render_engine != NULL);
}
/* called by renderer, checks job value */
static int render_view3d_break(void *rpv)
{
@@ -813,8 +818,9 @@ static int render_view3d_break(void *rpv)
return 1;
/* during render, rv3d->engine can get freed */
if (rp->rv3d->render_engine == NULL)
if (render_view3d_is_valid(rp) == false) {
*rp->stop = 1;
}
return *(rp->stop);
}
@@ -928,8 +934,11 @@ static void render_view3d_startjob(void *customdata, short *stop, short *do_upda
RE_Database_Preprocess(re);
/* conversion not completed, need to do it again */
if (!rstats->convertdone)
rp->engine->job_update_flag |= PR_UPDATE_DATABASE;
if (!rstats->convertdone) {
if (render_view3d_is_valid(rp)) {
rp->engine->job_update_flag |= PR_UPDATE_DATABASE;
}
}
// printf("dbase update\n");
}