Campbell Barton 5c6ee6b523 svn merge ^/trunk/blender -r42670:42680

2011-12-17 02:41:53 +00:00

..

CMakeLists.txt

Merge with trunk r41411

2011-10-31 13:18:14 +00:00

dynamicpaint_ops.c

share code for fluidsim, ocean & dynamic paint file paths.

2011-11-20 14:38:11 +00:00

particle_boids.c

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

particle_edit.c

manual sync with trunk - pulling in changes where the issues are not bmesh spesific

2011-12-04 23:13:28 +00:00

particle_object.c

svn merge -r41575:41602 ^/trunk/blender

2011-11-07 07:01:24 +00:00

physics_fluid.c

replace FILE_MAXDIR + FILE_MAXFILE with FILE_MAX

2011-11-26 04:07:38 +00:00

physics_intern.h

remove header text:

2011-11-29 10:54:47 +00:00

physics_ops.c

Merge with trunk r41342

2011-10-28 17:00:53 +00:00

physics_pointcache.c

style edit only - move parenthesis onto second line of function definition (in keeping with most of blenders code)

2011-12-17 00:52:36 +00:00

SConscript

svn merge -r39493:39664 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-08-24 02:29:45 +00:00