Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2008-09-30 02:31:47 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2008-09-30 02:31:47 +0400
commit31acc8ba9ca1da36e9c0a0c00ba8895c0314385a (patch)
treedfa1284fe5218385d4bb4cbae15d047eebdbc88a /source/blender/render
parentfed535f1fb68cb1d1f04941ec2123b6b0cb01852 (diff)
Fix for bug #17713: touch/no override for rendering was broken.
Diffstat (limited to 'source/blender/render')
-rw-r--r--source/blender/render/intern/source/pipeline.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 6bdd57612c7..1dfcbc6e45d 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -2613,6 +2613,8 @@ void RE_BlenderAnim(Render *re, Scene *scene, int sfra, int efra, int tfra)
scene_update_for_newframe(scene, lay);
continue;
}
+ else
+ nfra+= tfra;
if (scene->r.mode & (R_NO_OVERWRITE | R_TOUCH) ) {
BKE_makepicstring(name, scene->r.pic, scene->r.cfra, scene->r.imtype);
@@ -2643,7 +2645,6 @@ void RE_BlenderAnim(Render *re, Scene *scene, int sfra, int efra, int tfra)
break;
}
- nfra+= tfra;
}
}