[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58082] trunk/blender/source/blender: Fix #35979, #35937, #35739: undo crashes and missing updates with blender
Brecht Van Lommel
brechtvanlommel at pandora.be
Tue Jul 9 00:26:11 CEST 2013
Revision: 58082
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58082
Author: blendix
Date: 2013-07-08 22:26:10 +0000 (Mon, 08 Jul 2013)
Log Message:
-----------
Fix #35979, #35937, #35739: undo crashes and missing updates with blender
internal viewport rendering. Lots of tweaks here, mainly:
* Stop 3D viewport render and free database before undo.
* Accumulate update flags rather than replace them each time it rerenders, to
avoid previous updates getting lost.
* Don't check against Render struct view parameters for changes, those are set
in the job thread which might not run before the next update call.
Modified Paths:
--------------
trunk/blender/source/blender/editors/include/ED_render.h
trunk/blender/source/blender/editors/render/render_intern.h
trunk/blender/source/blender/editors/render/render_internal.c
trunk/blender/source/blender/editors/render/render_update.c
trunk/blender/source/blender/editors/util/undo.c
trunk/blender/source/blender/render/extern/include/RE_engine.h
trunk/blender/source/blender/render/intern/source/convertblender.c
Modified: trunk/blender/source/blender/editors/include/ED_render.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_render.h 2013-07-08 18:27:32 UTC (rev 58081)
+++ trunk/blender/source/blender/editors/include/ED_render.h 2013-07-08 22:26:10 UTC (rev 58082)
@@ -52,6 +52,8 @@
void ED_render_engine_area_exit(struct ScrArea *sa);
void ED_render_scene_update(struct Main *bmain, struct Scene *scene, int updated);
+void ED_viewport_render_kill_jobs(const struct bContext *C);
+
/* render_preview.c */
/* stores rendered preview - is also used for icons */
Modified: trunk/blender/source/blender/editors/render/render_intern.h
===================================================================
--- trunk/blender/source/blender/editors/render/render_intern.h 2013-07-08 18:27:32 UTC (rev 58081)
+++ trunk/blender/source/blender/editors/render/render_intern.h 2013-07-08 22:26:10 UTC (rev 58082)
@@ -83,7 +83,7 @@
/* render_internal.c */
void RENDER_OT_render(struct wmOperatorType *ot);
-void render_view3d(struct RenderEngine *engine, const struct bContext *C);
+void render_view3d_update(struct RenderEngine *engine, const struct bContext *C);
void render_view3d_draw(struct RenderEngine *engine, const struct bContext *C);
/* render_opengl.c uses this */
Modified: trunk/blender/source/blender/editors/render/render_internal.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_internal.c 2013-07-08 18:27:32 UTC (rev 58081)
+++ trunk/blender/source/blender/editors/render/render_internal.c 2013-07-08 22:26:10 UTC (rev 58082)
@@ -728,6 +728,7 @@
#define PR_UPDATE_VIEW 1
#define PR_UPDATE_RENDERSIZE 2
#define PR_UPDATE_MATERIAL 4
+#define PR_UPDATE_DATABASE 8
typedef struct RenderPreview {
/* from wmJob */
@@ -744,8 +745,6 @@
RenderEngine *engine;
float viewmat[4][4];
-
- int keep_data;
} RenderPreview;
static int render_view3d_disprect(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D *rv3d, rcti *disprect)
@@ -846,7 +845,13 @@
float clipsta, clipend, pixsize;
bool orth, restore = 0;
char name[32];
-
+ int update_flag;
+
+ update_flag = rp->engine->job_update_flag;
+ rp->engine->job_update_flag = 0;
+
+ //printf("ma %d res %d view %d db %d\n", update_flag & PR_UPDATE_MATERIAL, update_flag & PR_UPDATE_RENDERSIZE, update_flag & PR_UPDATE_VIEW, update_flag & PR_UPDATE_DATABASE);
+
G.is_break = FALSE;
if (false == render_view3d_get_rects(rp->ar, rp->v3d, rp->rv3d, &viewplane, rp->engine, &clipsta, &clipend, &pixsize, &orth))
@@ -861,13 +866,6 @@
sprintf(name, "View3dPreview %p", (void *)rp->ar);
re = rp->engine->re = RE_GetRender(name);
- if (rp->engine->re == NULL) {
-
- re = rp->engine->re = RE_NewRender(name);
-
- rp->keep_data = 0;
- }
-
/* set this always, rp is different for each job */
RE_test_break_cb(re, rp, render_view3d_break);
RE_display_draw_cb(re, rp, render_view3d_draw_update);
@@ -875,7 +873,7 @@
rstats = RE_GetStats(re);
- if (rp->keep_data == 0 || rstats->convertdone == 0 || (rp->keep_data & PR_UPDATE_RENDERSIZE)) {
+ if ((update_flag & (PR_UPDATE_RENDERSIZE|PR_UPDATE_DATABASE)) || rstats->convertdone == 0) {
/* no osa, blur, seq, layers, etc for preview render */
rdata = rp->scene->r;
rdata.mode &= ~(R_OSA | R_MBLUR | R_BORDER | R_PANORAMA);
@@ -901,11 +899,7 @@
RE_SetPixelSize(re, pixsize);
- /* database free can crash on a empty Render... */
- if (rp->keep_data == 0 && rstats->convertdone)
- RE_Database_Free(re);
-
- if (rstats->convertdone == 0) {
+ if ((update_flag & PR_UPDATE_DATABASE) || rstats->convertdone == 0) {
unsigned int lay = rp->scene->lay;
/* allow localview render for objects with lights in normal layers */
@@ -917,12 +911,17 @@
/* copying blender data while main thread is locked, to avoid crashes */
WM_job_main_thread_lock_acquire(rp->job);
+ RE_Database_Free(re);
RE_Database_FromScene(re, rp->bmain, rp->scene, lay, 0); // 0= dont use camera view
WM_job_main_thread_lock_release(rp->job);
/* do preprocessing like building raytree, shadows, volumes, SSS */
RE_Database_Preprocess(re);
+ /* conversion not completed, need to do it again */
+ if (!rstats->convertdone)
+ rp->engine->job_update_flag |= PR_UPDATE_DATABASE;
+
// printf("dbase update\n");
}
else {
@@ -940,8 +939,6 @@
/* always rotate back */
if (restore)
RE_DataBase_IncrementalView(re, rp->viewmat, 1);
-
- rp->engine->flag &= ~RE_ENGINE_DO_UPDATE;
}
}
@@ -952,16 +949,88 @@
MEM_freeN(rp);
}
-static void render_view3d_do(RenderEngine *engine, const bContext *C, int keep_data)
+static bool render_view3d_flag_changed(RenderEngine *engine, const bContext *C)
{
+ RegionView3D *rv3d = CTX_wm_region_view3d(C);
+ View3D *v3d = CTX_wm_view3d(C);
+ ARegion *ar = CTX_wm_region(C);
+ Scene *scene = CTX_data_scene(C);
+ Render *re;
+ rctf viewplane;
+ rcti disprect;
+ float clipsta, clipend;
+ bool orth;
+ int job_update_flag = 0;
+ char name[32];
+
+ /* ensure render engine exists */
+ re = engine->re;
+
+ if (!re) {
+ sprintf(name, "View3dPreview %p", (void *)ar);
+ re = engine->re = RE_GetRender(name);
+ if (!re)
+ re = engine->re = RE_NewRender(name);
+
+ engine->update_flag |= RE_ENGINE_UPDATE_DATABASE;
+ }
+
+ /* check update_flag */
+ if (engine->update_flag & RE_ENGINE_UPDATE_MA)
+ job_update_flag |= PR_UPDATE_MATERIAL;
+
+ if (engine->update_flag & RE_ENGINE_UPDATE_OTHER)
+ job_update_flag |= PR_UPDATE_MATERIAL;
+
+ if (engine->update_flag & RE_ENGINE_UPDATE_DATABASE)
+ job_update_flag |= PR_UPDATE_DATABASE;
+
+ engine->update_flag = 0;
+
+ /* check if viewport changed */
+ if (engine->last_winx != ar->winx || engine->last_winy != ar->winy) {
+ engine->last_winx = ar->winx;
+ engine->last_winy = ar->winy;
+ job_update_flag |= PR_UPDATE_RENDERSIZE;
+ }
+
+ if (compare_m4m4(engine->last_viewmat, rv3d->viewmat, 0.00001f) == 0) {
+ copy_m4_m4(engine->last_viewmat, rv3d->viewmat);
+ job_update_flag |= PR_UPDATE_VIEW;
+ }
+
+ render_view3d_get_rects(ar, v3d, rv3d, &viewplane, engine, &clipsta, &clipend, NULL, &orth);
+
+ if (BLI_rctf_compare(&viewplane, &engine->last_viewplane, 0.00001f) == 0) {
+ engine->last_viewplane = viewplane;
+ job_update_flag |= PR_UPDATE_VIEW;
+ }
+
+ render_view3d_disprect(scene, ar, v3d, rv3d, &disprect);
+ if (BLI_rcti_compare(&disprect, &engine->last_disprect) == 0) {
+ engine->last_disprect = disprect;
+ job_update_flag |= PR_UPDATE_RENDERSIZE;
+ }
+
+ /* any changes? go ahead and rerender */
+ if (job_update_flag) {
+ engine->job_update_flag |= job_update_flag;
+ return true;
+ }
+
+ return false;
+}
+
+static void render_view3d_do(RenderEngine *engine, const bContext *C)
+{
wmJob *wm_job;
RenderPreview *rp;
Scene *scene = CTX_data_scene(C);
- if (CTX_wm_window(C) == NULL) {
- engine->flag |= RE_ENGINE_DO_UPDATE;
+ if (CTX_wm_window(C) == NULL)
return;
- }
+ if (!render_view3d_flag_changed(engine, C))
+ return;
wm_job = WM_jobs_get(CTX_wm_manager(C), CTX_wm_window(C), CTX_wm_region(C), "Render Preview",
WM_JOB_EXCL_RENDER, WM_JOB_TYPE_RENDER_PREVIEW);
@@ -976,7 +1045,6 @@
rp->v3d = rp->sa->spacedata.first;
rp->rv3d = CTX_wm_region_view3d(C);
rp->bmain = CTX_data_main(C);
- rp->keep_data = keep_data;
copy_m4_m4(rp->viewmat, rp->rv3d->viewmat);
/* dont alloc in threads */
@@ -991,81 +1059,34 @@
WM_jobs_start(CTX_wm_manager(C), wm_job);
engine->flag &= ~RE_ENGINE_DO_UPDATE;
-
}
/* callback for render engine , on changes */
-void render_view3d(RenderEngine *engine, const bContext *C)
+void render_view3d_update(RenderEngine *engine, const bContext *C)
{
- render_view3d_do(engine, C, 0);
-}
+ /* this shouldn't be needed and causes too many database rebuilds, but we
+ * aren't actually tracking updates for all relevent datablocks so this is
+ * a catch-all for updates */
+ engine->update_flag |= RE_ENGINE_UPDATE_DATABASE;
-static int render_view3d_changed(RenderEngine *engine, const bContext *C)
-{
- ARegion *ar = CTX_wm_region(C);
- Render *re;
- int update = 0;
- char name[32];
-
- sprintf(name, "View3dPreview %p", (void *)ar);
- re = RE_GetRender(name);
-
- if (re) {
- RegionView3D *rv3d = CTX_wm_region_view3d(C);
- View3D *v3d = CTX_wm_view3d(C);
- Scene *scene = CTX_data_scene(C);
- rctf viewplane, viewplane1;
- rcti disprect, disprect1;
- float mat[4][4];
- float clipsta, clipend;
- bool orth;
-
- if (engine->update_flag & RE_ENGINE_UPDATE_MA)
- update |= PR_UPDATE_MATERIAL;
-
- if (engine->update_flag & RE_ENGINE_UPDATE_OTHER)
- update |= PR_UPDATE_MATERIAL;
-
- engine->update_flag = 0;
-
- if (engine->resolution_x != ar->winx || engine->resolution_y != ar->winy)
- update |= PR_UPDATE_RENDERSIZE;
-
- RE_GetView(re, mat);
- if (compare_m4m4(mat, rv3d->viewmat, 0.00001f) == 0) {
- update |= PR_UPDATE_VIEW;
- }
-
- render_view3d_get_rects(ar, v3d, rv3d, &viewplane, engine, &clipsta, &clipend, NULL, &orth);
- RE_GetViewPlane(re, &viewplane1, &disprect1);
-
- if (BLI_rctf_compare(&viewplane, &viewplane1, 0.00001f) == 0)
- update |= PR_UPDATE_VIEW;
-
- render_view3d_disprect(scene, ar, v3d, rv3d, &disprect);
- if (BLI_rcti_compare(&disprect, &disprect1) == 0)
- update |= PR_UPDATE_RENDERSIZE;
-
- if (update)
- engine->flag |= RE_ENGINE_DO_UPDATE;
- //if (update)
- // printf("changed ma %d res %d view %d\n", update & PR_UPDATE_MATERIAL, update & PR_UPDATE_RENDERSIZE, update & PR_UPDATE_VIEW);
- }
-
- return update;
+ render_view3d_do(engine, C);
}
void render_view3d_draw(RenderEngine *engine, const bContext *C)
{
Render *re = engine->re;
RenderResult rres;
- int keep_data = render_view3d_changed(engine, C);
+ char name[32];
- if (engine->flag & RE_ENGINE_DO_UPDATE)
- render_view3d_do(engine, C, keep_data);
-
- if (re == NULL) return;
+ render_view3d_do(engine, C);
+ if (re == NULL) {
+ sprintf(name, "View3dPreview %p", (void *)CTX_wm_region(C));
+ re = RE_GetRender(name);
+
+ if (re == NULL) return;
+ }
+
RE_AcquireResultImage(re, &rres);
if (rres.rectf) {
@@ -1114,3 +1135,52 @@
RE_ReleaseResultImage(re);
}
+
+void ED_viewport_render_kill_jobs(const bContext *C)
+{
+ wmWindowManager *wm = CTX_wm_manager(C);
+ Main *bmain = CTX_data_main(C);
+ bScreen *sc;
+ ScrArea *sa;
+ ARegion *ar;
+
+ if (!wm)
+ return;
+
+ /* kill all actively running jobs */
+ WM_jobs_kill(wm, NULL, render_view3d_startjob);
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list