[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36391] trunk/blender/source/blender/ render/intern/source/pipeline.c: fixed a crash introduced in r36384
M.G. Kishalmi
lmg at kishalmi.net
Sat Apr 30 12:02:23 CEST 2011
Revision: 36391
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36391
Author: lmg
Date: 2011-04-30 10:02:23 +0000 (Sat, 30 Apr 2011)
Log Message:
-----------
fixed a crash introduced in r36384
where the preview render was calling getCam before setting the scene.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36384
Modified Paths:
--------------
trunk/blender/source/blender/render/intern/source/pipeline.c
Modified: trunk/blender/source/blender/render/intern/source/pipeline.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/pipeline.c 2011-04-30 08:54:06 UTC (rev 36390)
+++ trunk/blender/source/blender/render/intern/source/pipeline.c 2011-04-30 10:02:23 UTC (rev 36391)
@@ -3137,7 +3137,7 @@
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 @@
re->scene = sce;
re->lay = sce->lay;
+ camera = RE_GetCamera(re);
RE_SetCamera(re, camera);
do_render_3d(re);
More information about the Bf-blender-cvs
mailing list