Merge branch 'master' into blender2.8
[blender.git] / source / blender / blenkernel / intern / ocean.c
2011-11-25 Sergey SharybinMerging r42062 through r42159 from trunk into soc-2011...
2011-11-22 Campbell Bartonsvn merge ^/trunk/blender -r42069:42076
2011-11-22 Campbell Bartonocean sim
2011-11-22 Thomas Dinges2.6 Various code cleanup:
2011-11-22 Sergey SharybinMerging r41937 through r42061 from trunk into soc-2011...
2011-11-22 Campbell Bartonsvn merge ^/trunk/blender -r42009:42053
2011-11-22 Campbell Bartonrename image type defines to be less ambiguous, also...
2011-11-21 Campbell Bartonmove image settings into their own structure so the...
2011-11-20 Tamito KajiyamaMerged changes in the trunk up to revision 42021.
2011-11-20 Antony RiakiotakisFix different declaration and implementation of functio...
2011-11-20 Sergey SharybinFix compilation error with oceansim disabled
2011-11-20 Campbell Bartonsvn merge ^/trunk/blender -r41998:42009
2011-11-20 Campbell Bartonshare code for fluidsim, ocean & dynamic paint file...
2011-11-16 Sergey SharybinMerged trunk up to rev41928
2011-11-15 Campbell Bartonsvn merge -r41779:41847 ^/trunk/blender
2011-11-14 Campbell BartonOcean baking was using uninitialized memory, but furthe...
2011-11-13 Bastien MontagneQuiting a warning in Ocean code (commenting out var).
2011-11-13 Campbell Bartonremove double promotions and some formatting edits...
2011-11-13 Campbell Bartonensure that the path and directory are joined correctly...
2011-11-13 Lukas ToenneStub data in Ocean modifier when disabled, C standard...
2011-11-13 Lukas ToenneOcean Sim modifier patch