56 Commits

Author	SHA1	Message	Date
Campbell Barton	e6e265b2b5	svn merge -r41779:41847 ^/trunk/blender	2011-11-15 02:58:06 +00:00
Campbell Barton	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
Campbell Barton	dfd20bb888	remove double promotions and some formatting edits (tabs & spaces mixed)	2011-11-13 16:10:01 +00:00
Bastien Montagne	2af9b9476e	Make Ocean modifier compile again! Also removed it’s $ID$ heading stuff.	2011-11-13 15:41:40 +00:00
Campbell Barton	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