blender/release/scripts
Tamito Kajiyama 69289c978e Merged changes in the trunk up to revision 44266 (including BMesh).
Freestyle edge/face marks were ported to BMesh.

Conflicts resolved:
source/blender/editors/mesh/editface.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_meshdata_types.h
source/blender/blenkernel/intern/editderivedmesh.c
2012-02-21 01:40:04 +00:00
..
freestyle Fix for the Selection by Image Border not working properly. 2012-02-05 18:42:51 +00:00
modules BMesh Merge 2012-02-19 19:12:36 +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 44266 (including BMesh). 2012-02-21 01:40:04 +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