Tamito Kajiyama 9f243d531c Merged changes in the trunk up to revision 44288. ...

Conflicts resolved:
source/blender/blenkernel/intern/cdderivedmesh.c

2012-02-21 02:19:54 +00:00

..

freestyle

Fix for the Selection by Image Border not working properly.

2012-02-05 18:42:51 +00:00

modules

copy over a change from bmesh branch that was needed for lightmap unpack to work, also tag some rna vars as unused.

2012-02-20 22:58:00 +00:00

presets

svn merge ^/trunk/blender -r44076:44118

2012-02-15 12:08:06 +00:00

startup

Merged changes in the trunk up to revision 44288.

2012-02-21 02:19:54 +00:00

templates

Correct mathutils documentation, also correct some python spelling errors and add makefile target check_spelling

2012-02-08 04:37:37 +00:00