[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14877] trunk/blender/source/blender/ blenkernel/intern/image.c: Bugfix #11717:

[Joshua Leung]

Revision: 14877
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14877
Author:   aligorith
Date:     2008-05-17 02:35:30 +0200 (Sat, 17 May 2008)

Log Message:
-----------
Bugfix #11717:

Rendering (Internal/OGL) would crash when StampInfo was on and adding info about the active camera, if there was no camera in the scene.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/image.c

Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c	2008-05-17 00:02:08 UTC (rev 14876)
+++ trunk/blender/source/blender/blenkernel/intern/image.c	2008-05-17 00:35:30 UTC (rev 14877)
@@ -990,8 +990,11 @@
 	}
 
 	if (G.scene->r.stamp & R_STAMP_CAMERA) {
-		if (do_prefix)		sprintf(stamp_data->camera, "Camera %s", ((Camera *) G.scene->camera)->id.name+2);
-		else				sprintf(stamp_data->camera, "%s", ((Camera *) G.scene->camera)->id.name+2);
+		if (G.scene->camera) strcpy(text, ((Camera *) G.scene->camera)->id.name+2);
+		else 		strcpy(text, "<none>");
+		
+		if (do_prefix)		sprintf(stamp_data->camera, "Camera %s", text);
+		else				sprintf(stamp_data->camera, "%s", text);
 	} else {
 		stamp_data->camera[0] = '\0';
 	}