[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13734] trunk/blender/source/blender: Bugfix [#8196] sequencer crash when adding scene without camera

[Campbell Barton]

Revision: 13734
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13734
Author:   campbellbarton
Date:     2008-02-17 21:44:07 +0100 (Sun, 17 Feb 2008)

Log Message:
-----------
Bugfix [#8196] sequencer crash when adding scene without camera
added checks for a camera
Also added an error ob bake if there are no active objects.

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/source/rendercore.c
    trunk/blender/source/blender/src/meshtools.c
    trunk/blender/source/blender/src/sequence.c

Modified: trunk/blender/source/blender/render/intern/source/rendercore.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/rendercore.c	2008-02-17 20:36:13 UTC (rev 13733)
+++ trunk/blender/source/blender/render/intern/source/rendercore.c	2008-02-17 20:44:07 UTC (rev 13734)
@@ -2255,7 +2255,7 @@
 	}
 	
 	/* calculate return value */
-	for(a=0; a<re->r.threads; a++) {
+ 	for(a=0; a<re->r.threads; a++) {
 		vdone+= handles[a].vdone;
 		
 		zbuf_free_span(handles[a].zspan);

Modified: trunk/blender/source/blender/src/meshtools.c
===================================================================
--- trunk/blender/source/blender/src/meshtools.c	2008-02-17 20:36:13 UTC (rev 13733)
+++ trunk/blender/source/blender/src/meshtools.c	2008-02-17 20:44:07 UTC (rev 13734)
@@ -1041,9 +1041,11 @@
 		return;
 	}	 
 	
-	if(active && !actob)
+	if(active && !actob) {
+		*error_msg = "No active object";
 		return;
-		
+	}
+	
 	if(event>0) {
 		Render *re= RE_NewRender("_Bake View_");
 		ScrArea *area= biggest_image_area();

Modified: trunk/blender/source/blender/src/sequence.c
===================================================================
--- trunk/blender/source/blender/src/sequence.c	2008-02-17 20:36:13 UTC (rev 13733)
+++ trunk/blender/source/blender/src/sequence.c	2008-02-17 20:44:07 UTC (rev 13734)
@@ -1651,14 +1651,16 @@
 		int doseq, rendering= G.rendering;
 		char scenename[64];
 			
-		if (se->ibuf==NULL && seq->scene && !build_proxy_run) {
+		if (se->ibuf==NULL && seq->scene && seq->scene->camera && !build_proxy_run) {
 			se->ibuf = seq_proxy_fetch(seq, cfra);
 			if (se->ibuf) {
 				input_preprocess(seq, se, cfra);
 			}
 		}
-
-		if (se->ibuf==NULL && seq->scene) {
+		
+		if (seq->scene && seq->scene->camera==NULL) {
+			se->ok = STRIPELEM_FAILED;
+		} else if (se->ibuf==NULL && seq->scene && seq->scene->camera) {
 			waitcursor(1);
 			
 			/* Hack! This function can be called from do_render_seq(), in that case
@@ -1715,7 +1717,11 @@
 			CFRA = oldcfra;
 
 			if (!build_proxy_run) {
-				input_preprocess(seq, se, cfra);
+				if(se->ibuf == NULL) {
+					se->ok = STRIPELEM_FAILED;
+				} else {
+					input_preprocess(seq, se, cfra);
+				}
 			}
 
 		}