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:
authorCampbell Barton <ideasman42@gmail.com>2010-03-09 10:41:04 +0300
committerCampbell Barton <ideasman42@gmail.com>2010-03-09 10:41:04 +0300
commitd4756d395bde04dc6cfeed696df1c38211ffbff9 (patch)
treef4c3a707b6ba88088036432de874ae1047cd9d7d /source/blender/render
parent9c513346a57d3a6b000822685158b67d56d5d99f (diff)
remove for bad-level-call & some minor changes to make camera switching neater.
Diffstat (limited to 'source/blender/render')
-rw-r--r--source/blender/render/intern/source/pipeline.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 0122f1b5d65..385191f93bc 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -2584,11 +2584,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();