Tamito Kajiyama 329b05dcd7 Merged changes in the trunk up to revision 47381. ...

Conflicts resolved:
source/blender/blenloader/intern/readfile.c

2012-06-03 21:11:10 +00:00

..

freestyle

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

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

modules

Fix #31658: missing properties in key configuration export, hidden properties

2012-05-31 16:04:07 +00:00

presets

[#31607] Collada: (Exporter) Implementation of 'use Object Instantiation' Option

2012-05-26 22:46:28 +00:00

startup

Merged changes in the trunk up to revision 47381.

2012-06-03 21:11:10 +00:00

templates

fix for modal timer template, wasnt updated for changes to themes.

2012-04-27 10:00:21 +00:00