Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Leung <aligorith@gmail.com>2009-08-15 04:40:44 +0400
committerJoshua Leung <aligorith@gmail.com>2009-08-15 04:40:44 +0400
commitdc952c7f2b80ddfeba31f309b06f19bacdb15000 (patch)
treec12a5f4aa53c1592092a24bd2ab4fef201648f7e /source/blender/blenkernel
parentd0607c9d8d803885018f7e5b872e98222130f881 (diff)
parente7c53e20a18573e05970beb93184fc32b88c98c9 (diff)
Commenting out code from commit 22457 by Genscher for PointCache.
There was some missing code or something causing compiling problems.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/BKE_pointcache.h1
-rw-r--r--source/blender/blenkernel/intern/pointcache.c4
2 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_pointcache.h b/source/blender/blenkernel/BKE_pointcache.h
index 55afec7c6f1..5d9dddfe30d 100644
--- a/source/blender/blenkernel/BKE_pointcache.h
+++ b/source/blender/blenkernel/BKE_pointcache.h
@@ -75,6 +75,7 @@ struct SoftBody;
struct ParticleSystem;
struct ParticleKey;
struct ClothModifierData;
+struct SmokeModifierData;
struct PointCache;
struct ListBase;
diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c
index cbbc09679c5..d326fa84ed4 100644
--- a/source/blender/blenkernel/intern/pointcache.c
+++ b/source/blender/blenkernel/intern/pointcache.c
@@ -469,6 +469,7 @@ void BKE_ptcache_id_from_particles(PTCacheID *pid, Object *ob, ParticleSystem *p
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 @@ void BKE_ptcache_id_from_smoke(PTCacheID *pid, struct Object *ob, struct SmokeMo
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 @@ void BKE_ptcache_update_info(PTCacheID *pid)
}
else
sprintf(cache->info, "%s.", mem_info);
-} \ No newline at end of file
+}