[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25131] trunk/blender/source/blender: Null check for baking progressend function

[Martin Poirier]

Revision: 25131
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25131
Author:   theeth
Date:     2009-12-04 20:08:07 +0100 (Fri, 04 Dec 2009)

Log Message:
-----------
Null check for baking progressend function

Simplify end of line for console progress.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/pointcache.c
    trunk/blender/source/blender/editors/physics/physics_pointcache.c

Modified: trunk/blender/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/pointcache.c	2009-12-04 19:07:25 UTC (rev 25130)
+++ trunk/blender/source/blender/blenkernel/intern/pointcache.c	2009-12-04 19:08:07 UTC (rev 25131)
@@ -2361,8 +2361,10 @@
 		if(baker->break_test && baker->break_test(baker->break_data))
 			break;
 	}
-	baker->progressend(baker->progresscontext);
 
+	if (baker->progressend)
+		baker->progressend(baker->progresscontext);
+
 	/* clear baking flag */
 	if(pid) {
 		cache->flag &= ~(PTCACHE_BAKING|PTCACHE_REDO_NEEDED);

Modified: trunk/blender/source/blender/editors/physics/physics_pointcache.c
===================================================================
--- trunk/blender/source/blender/editors/physics/physics_pointcache.c	2009-12-04 19:07:25 UTC (rev 25130)
+++ trunk/blender/source/blender/editors/physics/physics_pointcache.c	2009-12-04 19:08:07 UTC (rev 25131)
@@ -84,11 +84,11 @@
 {
 	printf("\rbake: %3i%%", nr);
 	fflush(stdout);
+}
 
-	/* endline for last report */
-	if (nr == 100) {
-		printf("\n");
-	}
+void bake_console_progress_end(void *arg, int nr)
+{
+	printf("\n");
 }
 
 static int ptcache_bake_all_exec(bContext *C, wmOperator *op)
@@ -113,7 +113,7 @@
 		baker.progresscontext = win;
 	} else {
 		baker.progressbar = bake_console_progress;
-		baker.progressend = NULL;
+		baker.progressend = bake_console_progress_end;
 		baker.progresscontext = NULL;
 	}
 
@@ -207,7 +207,7 @@
 	} else {
 		printf("\n"); /* empty first line before console reports */
 		baker.progressbar = bake_console_progress;
-		baker.progressend = NULL;
+		baker.progressend = bake_console_progress_end;
 		baker.progresscontext = NULL;
 	}