revert Joseph Eagar's eltopo commits r36073, 36075 (& some minor edits)
authorCampbell Barton <ideasman42@gmail.com>
Tue, 12 Apr 2011 11:09:10 +0000 (11:09 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 12 Apr 2011 11:09:10 +0000 (11:09 +0000)
commita42bf453335bdd569556895a168bced1fa7b3c3c
tree479839e47a44db5a3bc7a6a927befb62fc5091aa
parentb7269aa36e1e86dfa5142770e5f12c89f3898501
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
build_files/cmake/FindPythonLibsUnix.cmake
build_files/scons/tools/btools.py
extern/CMakeLists.txt
extern/SConscript
source/blender/blenkernel/BKE_collision.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/collision.c
source/blenderplayer/CMakeLists.txt
source/creator/CMakeLists.txt