Tamito Kajiyama ed0e2fbd9f Merged changes in the trunk up to revision 52690. ...

Conflicts resolved:
release/datafiles/startup.blend
source/blender/blenlib/intern/bpath.c

2012-12-01 02:47:59 +00:00

..

freestyle

Fix for dashed line options not working as expected in some applications

2012-11-04 23:52:26 +00:00

modules

typo's and some style cleanup, also added asserts into BLI_vsnprintf and BLI_sprintfN when invalid args are given.

2012-11-28 06:43:04 +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 52690.

2012-12-01 02:47:59 +00:00

templates

add margin to view fitting view-all/local-view (wasn't obvious with the models I was testing with).

2012-11-30 06:55:36 +00:00