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/editors/render/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/editors/render/SConscript')
| -rw-r--r-- | source/blender/editors/render/SConscript | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/render/SConscript b/source/blender/editors/render/SConscript index e7e883f9ef6..e496e4b4373 100644 --- a/source/blender/editors/render/SConscript +++ b/source/blender/editors/render/SConscript @@ -7,7 +7,7 @@ incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' incs += ' ../../gpu ../../freestyle' incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern' -incs += ' ../../blenloader' +incs += ' ../../blenloader ../../bmesh' if env['OURPLATFORM'] == 'linux': cflags='-pthread' |