Tamito Kajiyama d433cd65f7 Merged changes in the trunk up to revision 53146. ...

Conflicts resolved:
release/datafiles/startup.blend
source/blender/blenkernel/CMakeLists.txt
source/blender/blenlib/intern/bpath.c
source/blender/blenloader/intern/readfile.c

2012-12-19 01:49:58 +00:00

..

freestyle

Further fix for svn:executable.

2012-12-11 23:05:04 +00:00

modules

Adding Amharic (i.e. ethiopic) language.

2012-12-18 09:13:04 +00:00

presets

update themes

2012-12-16 05:48:27 +00:00

startup

Merged changes in the trunk up to revision 53146.

2012-12-19 01:49:58 +00:00

templates

Fixed operator_modal_view3d_raycast.py template so that it uses hit points in world space to give correct selection. Also set selected object to active.

2012-12-18 10:43:06 +00:00