diff options
| author | Miika Hamalainen <blender@miikah.org> | 2011-07-22 22:51:53 +0400 |
|---|---|---|
| committer | Miika Hamalainen <blender@miikah.org> | 2011-07-22 22:51:53 +0400 |
| commit | 2a97e5a772d69c0963c7757033e240abef8d56b5 (patch) | |
| tree | a8737d358a27bbee8b996d31806a87069c094e23 /source/blender/blenkernel/intern/pointcache.c | |
| parent | cbe1613c0123d7705b9bba3806c03fe09151e729 (diff) | |
| parent | ffc490cbf1d93c7e0a9b97953f6f52e69b9bc8ec (diff) | |
Merge with trunk r38619
Diffstat (limited to 'source/blender/blenkernel/intern/pointcache.c')
| -rw-r--r-- | source/blender/blenkernel/intern/pointcache.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c index 32bb01110e9..e347e3896b0 100644 --- a/source/blender/blenkernel/intern/pointcache.c +++ b/source/blender/blenkernel/intern/pointcache.c @@ -518,6 +518,7 @@ static int ptcache_cloth_totpoint(void *cloth_v, int UNUSED(cfra)) return clmd->clothObject ? clmd->clothObject->numverts : 0; } +#ifdef WITH_SMOKE /* Smoke functions */ static int ptcache_smoke_totpoint(void *smoke_v, int UNUSED(cfra)) { @@ -656,6 +657,11 @@ static int ptcache_smoke_read(PTCacheFile *pf, void *smoke_v) return 1; } +#else // WITH_SMOKE +static int ptcache_smoke_totpoint(void *UNUSED(smoke_v), int UNUSED(cfra)) { return 0; }; +static void ptcache_smoke_read(PTCacheFile *UNUSED(pf), void *UNUSED(smoke_v)) {} +static int ptcache_smoke_write(PTCacheFile *UNUSED(pf), void *UNUSED(smoke_v)) { return 0; } +#endif // WITH_SMOKE static int ptcache_dynamicpaint_totpoint(void *sd, int cfra) { |