This repository has been archived on 2023-10-09. You can view files and clone it. You cannot open issues or pull requests or push a commit.

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

..

extern/include

Merged changes in the trunk up to revision 44221.

2012-02-18 11:26:11 +00:00

intern

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

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

CMakeLists.txt

Merged changes in the trunk up to revision 43219.

2012-01-08 11:57:53 +00:00

SConscript

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

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