diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-04-12 15:09:10 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-04-12 15:09:10 +0400 |
| commit | a42bf453335bdd569556895a168bced1fa7b3c3c (patch) | |
| tree | 479839e47a44db5a3bc7a6a927befb62fc5091aa /extern/CMakeLists.txt | |
| parent | b7269aa36e1e86dfa5142770e5f12c89f3898501 (diff) | |
revert Joseph Eagar's eltopo commits r36073, 36075 (& some minor edits)
discussed with Janne, Ton, Nathan and we agreed this kind of change at least needs discussion with module owners.
Its also too close to release to be making these kinds of changes.
commands used:
# reverse merge
svn merge -r36073:36072 .
# for some reason this gave a lot of property changes
svn revert `svn st | grep "^ M" | awk '{print $2}'`
# reverse merging didn't work here, removing while dir.
svn rm extern/eltopo/
# manually fixed conflict in
# ./source/blenderplayer/CMakeLists.txt
#
# also manually removed 2 lines from
# ./CMakeLists.txt
Diffstat (limited to 'extern/CMakeLists.txt')
| -rw-r--r-- | extern/CMakeLists.txt | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt index 3990d132757..d74c6683f2c 100644 --- a/extern/CMakeLists.txt +++ b/extern/CMakeLists.txt @@ -31,10 +31,6 @@ if(WITH_BULLET) add_subdirectory(bullet2) endif() -if(WITH_MOD_CLOTH_ELTOPO) - add_subdirectory(eltopo) -endif() - if(WITH_BINRELOC) add_subdirectory(binreloc) endif() |