Tamito Kajiyama cdbfd1db38 Merged changes in the trunk up to revision 45820. ...

Conflicts resolved:
source/creator/creator.c

2012-04-21 00:33:36 +00:00

..

freestyle

Added restrictions so as to apply thickness position options (revision 45463)

2012-04-08 22:21:48 +00:00

modules

bmesh todo: vertex dirtmap now working again.

2012-04-13 08:41:30 +00:00

presets

Fluid Simulation:

2012-04-15 21:02:08 +00:00

startup

Merged changes in the trunk up to revision 45820.

2012-04-21 00:33:36 +00:00

templates

move rip out into its own file

2012-04-17 10:25:23 +00:00