Tamito Kajiyama 66a2b84897 Merged changes in the trunk up to revision 54992. ...

Resolved conflicts:
release/scripts/startup/bl_ui/space_view3d.py

2013-03-03 15:07:49 +00:00

..

freestyle

Freestyle Python API improvements - part 9.

2013-02-24 23:43:40 +00:00

modules

More tweaks (gaining about ten seconds for each po in update branches process!).

2013-03-01 14:28:38 +00:00

presets

Collada: Added support for ngon export/import and added triangulate option to export

2013-03-02 15:58:13 +00:00

startup

Merged changes in the trunk up to revision 54992.

2013-03-03 15:07:49 +00:00

templates_osl

OSL Templates: remove unnecessary stdosl.h include.

2012-12-30 10:37:32 +00:00

templates_py

Missed instance of ThemeGeneric.back -> ThemeGradient.gradients.high_gradient

2013-02-23 12:55:19 +00:00