diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-03-18 04:48:59 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-03-18 04:48:59 +0400 |
| commit | c1ceab1281ccf061f03f8000bf190a082a5385d8 (patch) | |
| tree | 01b9a9cfca80432d316bdad6c18c74eb025e9eb0 /source/blender/bmesh/SConscript | |
| parent | 0d9c98c4bbfbc8c70c4772086dd09a51d01921ef (diff) | |
| parent | 66a35e089a64d27bfc09c2225a530069eca05875 (diff) | |
Merged changes in the trunk up to revision 55357.
Resolved conflicts:
release/datafiles/startup.blend
source/blender/editors/space_nla/nla_buttons.c
Also updated source/blender/blenkernel/intern/linestyle.c as a follow-up of
recent changes for the use of bool.
Diffstat (limited to 'source/blender/bmesh/SConscript')
| -rw-r--r-- | source/blender/bmesh/SConscript | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/bmesh/SConscript b/source/blender/bmesh/SConscript index fa6bdbcf26f..de839f7f6a6 100644 --- a/source/blender/bmesh/SConscript +++ b/source/blender/bmesh/SConscript @@ -34,16 +34,16 @@ sources += env.Glob('operators/*.c') sources += env.Glob('tools/*.c') incs = [ - './', - '../blenfont', - '../blenlib', - '../makesdna', - '../blenkernel', - '#/intern/guardedalloc', - '#/extern/bullet2/src', - '#/extern/rangetree', - '#/intern/opennl/extern' - ] + './', + '../blenfont', + '../blenlib', + '../makesdna', + '../blenkernel', + '#/intern/guardedalloc', + '#/extern/bullet2/src', + '#/extern/rangetree', + '#/intern/opennl/extern' + ] defs = [] |