[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22459] branches/blender2.5/blender/source /blender/blenkernel: Commenting out code from commit 22457 by Genscher for PointCache.

Joshua Leung aligorith at gmail.com
Sat Aug 15 02:40:46 CEST 2009


Revision: 22459
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22459
Author:   aligorith
Date:     2009-08-15 02:40:44 +0200 (Sat, 15 Aug 2009)

Log Message:
-----------
Commenting out code from commit 22457 by Genscher for PointCache.

There was some missing code or something causing compiling problems.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/blenkernel/BKE_pointcache.h
    branches/blender2.5/blender/source/blender/blenkernel/intern/pointcache.c

Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_pointcache.h
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_pointcache.h	2009-08-14 18:18:19 UTC (rev 22458)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_pointcache.h	2009-08-15 00:40:44 UTC (rev 22459)
@@ -75,6 +75,7 @@
 struct ParticleSystem;
 struct ParticleKey;
 struct ClothModifierData;
+struct SmokeModifierData;
 struct PointCache;
 struct ListBase;
 

Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/pointcache.c	2009-08-14 18:18:19 UTC (rev 22458)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/pointcache.c	2009-08-15 00:40:44 UTC (rev 22459)
@@ -469,6 +469,7 @@
 	pid->info_types= (1<<BPHYS_DATA_TIMES);
 }
 
+#if 0 // XXX smoke pointcache stuff breaks compiling now
 /* Smoke functions */
 static int ptcache_totpoint_smoke(void *smoke_v)
 {
@@ -572,6 +573,7 @@
 	pid->data_types= (1<<BPHYS_DATA_LOCATION); // bogus values tot make pointcache happy
 	pid->info_types= 0;
 }
+#endif // XXX smoke poitcache stuff breaks compiling
 
 void BKE_ptcache_id_from_cloth(PTCacheID *pid, Object *ob, ClothModifierData *clmd)
 {
@@ -2336,4 +2338,4 @@
 	}
 	else
 		sprintf(cache->info, "%s.", mem_info);
-}
\ No newline at end of file
+}





More information about the Bf-blender-cvs mailing list