Revision: 52481
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52481
Author: nazgul
Date: 2012-11-22 11:45:39 +0000 (Thu, 22 Nov 2012)
Log Message:
-----------
Fix #33263: Sequencer Command Line Bugs
Was own regressions since recursive sequencer commit.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/sequencer.c
Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c 2012-11-22
11:33:38 UTC (rev 52480)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c 2012-11-22
11:45:39 UTC (rev 52481)
@@ -2338,6 +2338,7 @@
*/
const short is_rendering = G.is_rendering;
+ const short is_background = G.background;
const int do_seq_gl = G.is_rendering ?
0 /* (context.scene->r.seq_flag & R_SEQ_GL_REND) */ :
(context.scene->r.seq_flag & R_SEQ_GL_PREV);
@@ -2409,8 +2410,11 @@
*
* disable rendered preview for sequencer while rendering --
it's very much possible
* that preview render will went into conflict with final render
+ *
+ * When rendering from command line renderer is called from
main thread, in this
+ * case it's always safe to render scene here
*/
- if (!is_thread_main || is_rendering == FALSE) {
+ if (!is_thread_main || is_rendering == FALSE || is_background) {
if (re == NULL)
re = RE_NewRender(scene->id.name);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
