[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56315] trunk/blender/source/blender/ editors/render/render_preview.c: Fix preview render not starting in some cases, now starts the preview rendering
Brecht Van Lommel
brechtvanlommel at pandora.be
Fri Apr 26 15:47:57 CEST 2013
Revision: 56315
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56315
Author: blendix
Date: 2013-04-26 13:47:57 +0000 (Fri, 26 Apr 2013)
Log Message:
-----------
Fix preview render not starting in some cases, now starts the preview rendering
job if no render result is found and no preview render job is already running.
Modified Paths:
--------------
trunk/blender/source/blender/editors/render/render_preview.c
Modified: trunk/blender/source/blender/editors/render/render_preview.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_preview.c 2013-04-26 13:42:55 UTC (rev 56314)
+++ trunk/blender/source/blender/editors/render/render_preview.c 2013-04-26 13:47:57 UTC (rev 56315)
@@ -572,9 +572,6 @@
}
}
}
- else {
- ok = 1;
- }
RE_ReleaseResultImage(re);
@@ -584,6 +581,7 @@
void ED_preview_draw(const bContext *C, void *idp, void *parentp, void *slotp, rcti *rect)
{
if (idp) {
+ wmWindowManager *wm = CTX_wm_manager(C);
ScrArea *sa = CTX_wm_area(C);
ID *id = (ID *)idp;
ID *parent = (ID *)parentp;
@@ -609,13 +607,11 @@
if (ok)
*rect = newrect;
- /* check for spacetype... */
- if (sbuts->spacetype == SPACE_BUTS && sbuts->preview) {
+ /* start a new preview render job if signalled through sbuts->preview,
+ * or if no render result was found and no preview render job is running */
+ if ((sbuts->spacetype == SPACE_BUTS && sbuts->preview) ||
+ (!ok && !WM_jobs_test(wm, sa, WM_JOB_TYPE_RENDER_PREVIEW))) {
sbuts->preview = 0;
- ok = 0;
- }
-
- if (ok == 0) {
ED_preview_shader_job(C, sa, id, parent, slot, newx, newy, PR_BUTS_RENDER);
}
}
More information about the Bf-blender-cvs
mailing list