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
path: root/source
diff options
context:
space:
mode:
authorM.G. Kishalmi <lmg@kishalmi.net>2011-04-30 14:02:23 +0400
committerM.G. Kishalmi <lmg@kishalmi.net>2011-04-30 14:02:23 +0400
commit14e2ac09eba96768046f7c5d5bd7ff6a6e2dac5d (patch)
tree76a11fe26aa0ebb6858c20667ae3c8468cb35be5 /source
parent03c362f1ab75dcf647b14a4de0ad636ece05ca82 (diff)
fixed a crash introduced in r36384
where the preview render was calling getCam before setting the scene.
Diffstat (limited to 'source')
-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 1a33a1abb8d..07b9657b5fe 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -3137,7 +3137,7 @@ void RE_BlenderAnim(Render *re, Main *bmain, Scene *scene, Object *camera_overri
void RE_PreviewRender(Render *re, Main *bmain, Scene *sce)
{
- Object *camera= RE_GetCamera(re);
+ Object *camera;
int winx, winy;
winx= (sce->r.size*sce->r.xsch)/100;
@@ -3149,6 +3149,7 @@ void RE_PreviewRender(Render *re, Main *bmain, Scene *sce)
re->scene = sce;
re->lay = sce->lay;
+ camera = RE_GetCamera(re);
RE_SetCamera(re, camera);
do_render_3d(re);