diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-02-21 05:40:04 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-02-21 05:40:04 +0400 |
| commit | 69289c978eace478bf992517473960d540895815 (patch) | |
| tree | 493d2c9bec32f761468b082fbbb015c748b71685 /source/blender/SConscript | |
| parent | 5f093d6a5867a365900158fcca71296852787aac (diff) | |
| parent | be674afdadaa1ab966147755e224e8bbda6807db (diff) | |
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
Diffstat (limited to 'source/blender/SConscript')
| -rw-r--r-- | source/blender/SConscript | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/SConscript b/source/blender/SConscript index 1fe815849db..95c9d0925b6 100644 --- a/source/blender/SConscript +++ b/source/blender/SConscript @@ -3,6 +3,7 @@ Import ('env') import sys SConscript(['avi/SConscript', + 'bmesh/SConscript', 'blenkernel/SConscript', 'blenlib/SConscript', 'blenloader/SConscript', |