9d05ccf9e8
svn merge -r41899:41926 ^/trunk/blender. also sync mempool with trunk and move BLI_mempool_alloc out of mempools header where it was inlined
2011-11-16 19:06:38 +00:00
Lukas Toenne
391f40e8c9
Default cache file paths for ocean and fluidsim modifiers are now "<temp folder>/ocean_cache/" and "<temp_folder>/fluid_cache/" when the file is not saved yet at the time the modifiers are created.
...
If it has been saved, the file paths are relative to the .blend: "//ocean_cache/" and "//fluid_cache/".
This should at least partially fix bug #29273 . Particle external point caches are not changed.
http://projects.blender.org/tracker/?func=detail&atid=498&aid=29273&group_id=9
2011-11-16 12:43:12 +00:00
c00c0134e0
svn merge -r41847:41899 ^/trunk/blender
2011-11-16 03:10:15 +00:00
502081879b
remove unused OceanModifierData member & use smaller flags where possible
2011-11-15 03:48:25 +00:00
e6e265b2b5
svn merge -r41779:41847 ^/trunk/blender
2011-11-15 02:58:06 +00:00
49ccf975f2
minor cleanup
...
- use NULL rather then 0 for pointers
- use static functions where possible
- add own includes to ensure func's and their declarations don't get out of sync.
2011-11-14 16:05:44 +00:00
dfd20bb888
remove double promotions and some formatting edits (tabs & spaces mixed)
2011-11-13 16:10:01 +00:00
2af9b9476e
Make Ocean modifier compile again! Also removed it’s $ID$ heading stuff.
2011-11-13 15:41:40 +00:00
8b32341775
ensure that the path and directory are joined correctly for ocean cache (assumed path ended with a '/')
2011-11-13 15:17:24 +00:00
Lukas Toenne
11c83d8432
Ocean Sim modifier patch
...
by Matt Ebb, Hamed Zaghaghi
This adds a new Modifier "Ocean" to simulate large-scale wave motion.
Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3]
The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled.
[1]
http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean
[2]
http://www.savetheoceansim.com
[3]
http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
