Commit: 26ca7deae93f945561fb52b092a00ea11d6bcc38
Author: Dalai Felinto
Date: Fri Aug 29 17:41:07 2014 +0200
Branches: multiview
https://developer.blender.org/rB26ca7deae93f945561fb52b092a00ea11d6bcc38
Merge remote-tracking branch 'origin/master' into multiview
===================================================================
===================================================================
diff --cc source/blender/render/intern/source/pipeline.c
index ad1adfe,1b7ce9a..31d3d42
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@@ -3357,11 -2951,12 +3359,13 @@@ void RE_BlenderAnim(Render *re, Main *b
unsigned int lay_override, int sfra, int efra, int tfra)
{
RenderData rd = scene->r;
- bMovieHandle *mh = BKE_movie_handle_get(scene->r.im_format.imtype);
+ bMovieHandle **mh = NULL;
int cfrao = scene->r.cfra;
int nfra, totrendered = 0, totskipped = 0;
+ const size_t totvideos = BKE_scene_num_videos(&rd);
+ BLI_callback_exec(re->main, (ID *)scene, BLI_CB_EVT_RENDER_INIT);
+
/* do not fully call for each frame, it initializes & pops output
window */
if (!render_initialize_from_main(re, &rd, bmain, scene, NULL,
camera_override, lay_override, 0, 1))
return;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
