Campbell Barton 5148828356 svn merge ^/trunk/blender -r44235:44250

2012-02-19 17:59:30 +00:00

..

CMakeLists.txt

Merge with trunk r41411

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

dynamicpaint_ops.c

replace:

2012-01-02 17:15:24 +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

svn merge ^/trunk/blender -r44235:44250

2012-02-19 17:59:30 +00:00

particle_object.c

remove CDDM_copy second argument, added CDDM_copy_from_tessface instead.

2012-01-29 21:59:47 +00:00

physics_fluid.c

Code Cleanup: avoid double promotion.

2012-02-04 06:55:29 +00:00

physics_intern.h

unify include guard defines, __$FILENAME__

2012-02-17 18:59:41 +00:00

physics_ops.c

more keymap edits

2012-01-16 16:12:03 +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