[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36394] trunk/blender/source/blender/ render/intern/source: Fix one more crash introduced with r36384: trying to bake resulted in a segfault

[Sergey Sharybin]

Revision: 36394
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36394
Author:   nazgul
Date:     2011-04-30 13:47:25 +0000 (Sat, 30 Apr 2011)
Log Message:
-----------
Fix one more crash introduced with r36384: trying to bake resulted in a segfault

Also, use tabs for indentation in previous fix for the same crash

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/convertblender.c
    trunk/blender/source/blender/render/intern/source/pipeline.c

Modified: trunk/blender/source/blender/render/intern/source/convertblender.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/convertblender.c	2011-04-30 11:28:09 UTC (rev 36393)
+++ trunk/blender/source/blender/render/intern/source/convertblender.c	2011-04-30 13:47:25 UTC (rev 36394)
@@ -5659,7 +5659,7 @@
 */
 void RE_Database_Baking(Render *re, Main *bmain, Scene *scene, unsigned int lay, int type, Object *actob)
 {
-	Object *camera= RE_GetCamera(re);
+	Object *camera;
 	float mat[4][4];
 	float amb[3];
 	int onlyselected, nolamps;
@@ -5701,6 +5701,8 @@
 	if(re->lay & 0xFF000000)
 		lay &= 0xFF000000;
 	
+	camera= RE_GetCamera(re);
+	
 	/* if no camera, set unit */
 	if(camera) {
 		normalize_m4(camera->obmat);

Modified: trunk/blender/source/blender/render/intern/source/pipeline.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/pipeline.c	2011-04-30 11:28:09 UTC (rev 36393)
+++ trunk/blender/source/blender/render/intern/source/pipeline.c	2011-04-30 13:47:25 UTC (rev 36394)
@@ -3149,7 +3149,7 @@
 	re->scene = sce;
 	re->lay = sce->lay;
 
-    camera = RE_GetCamera(re);
+	camera = RE_GetCamera(re);
 	RE_SetCamera(re, camera);
 
 	do_render_3d(re);