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

..

buildinfo.c

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

CMakeLists.txt

Merged changes in the trunk up to revision 44266 (including BMesh).

2012-02-21 01:40:04 +00:00

creator.c

Merged changes in the trunk up to revision 44266 (including BMesh).

2012-02-21 01:40:04 +00:00

SConscript

Shuffle some build code around to ensure debug builds on Windows actually run too.

2011-06-08 11:53:07 +00:00