[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32172] trunk/blender/source/blender/ blenkernel/intern/pointcache.c: Fix for [#23732] Smoke / load external cache doesn't work

Janne Karhu jhkarh at gmail.com
Tue Sep 28 12:04:42 CEST 2010


Revision: 32172
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32172
Author:   jhk
Date:     2010-09-28 12:04:41 +0200 (Tue, 28 Sep 2010)

Log Message:
-----------
Fix for [#23732] Smoke / load external cache doesn't work

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

Modified: trunk/blender/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/pointcache.c	2010-09-28 10:03:56 UTC (rev 32171)
+++ trunk/blender/source/blender/blenkernel/intern/pointcache.c	2010-09-28 10:04:41 UTC (rev 32172)
@@ -2943,7 +2943,10 @@
 				totframes++;
 		}
 
-		if(totframes && cache->totpoint)
+		/* smoke doesn't use frame 0 as info frame so can't check based on totpoint */
+		if(pid->type == PTCACHE_TYPE_SMOKE_DOMAIN && totframes)
+			sprintf(cache->info, "%i frames found!", totframes);
+		else if(totframes && cache->totpoint)
 			sprintf(cache->info, "%i points found!", cache->totpoint);
 		else
 			sprintf(cache->info, "No valid data to read!");





More information about the Bf-blender-cvs mailing list