archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merged changes in the trunk up to revision 27420.

Browse Source
This commit is contained in:
Tamito Kajiyama
2010-03-11 20:04:25 +00:00
parent 6f4ff64570 d896c1f21f
commit 8521442257
271 changed files with 6474 additions and 4376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/render/intern/source/pipeline.c
View File

@@ -2129,8 +2129,8 @@ static void load_backbuffer(Render *re)
char name[256];
strcpy(name, re->r.backbuf);
BLI_convertstringcode(name, G.sce);
BLI_convertstringframe(name, re->r.cfra, 0);
BLI_path_abs(name, G.sce);
BLI_path_frame(name, re->r.cfra, 0);
if(re->backbuf) {
re->backbuf->id.us--;
@@ -2593,11 +2593,7 @@ static void do_render_seq(Render * re)
/* main loop: doing sequence + fields + blur + 3d render + compositing */
static void do_render_all_options(Render *re)
{
#ifdef DURIAN_CAMERA_SWITCH
Object *camera= scene_find_camera_switch(re->scene);
if(camera)
re->scene->camera= camera;
#endif
scene_camera_switch_update(re->scene);
re->i.starttime= PIL_check_seconds_timer();