Tamito Kajiyama 15ed834343 Merged changes in the trunk up to revision 51718. ...

Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/makesrna/intern/rna_scene.c
release/datafiles/startup.blend

2012-10-29 01:09:12 +00:00

..

freestyle

Fix for the WithinImageBorderUP1D predicate not working with a ViewEdge such that

2012-05-28 23:53:28 +00:00

modules

A few more BMesh errors messages translated, and "automated" translation for modifers too!

2012-10-27 11:12:09 +00:00

presets

Fix #32780: Maya keymap selection issues

2012-10-10 08:07:28 +00:00

startup

Merged changes in the trunk up to revision 51718.

2012-10-29 01:09:12 +00:00

templates

minor changes

2012-10-17 16:10:04 +00:00