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
This commit is contained in:
Campbell Barton
2011-04-12 11:09:10 +00:00
parent b7269aa36e
commit a42bf45333
10 changed files with 7 additions and 728 deletions

View File

@@ -128,10 +128,6 @@ endif()
bf_intern_mikktspace
)
if(WITH_ELTOPO)
list(APPEND BLENDER_SORTED_LIBS extern_eltopo)
endif()
if(WITH_BUILTIN_GLEW)
list(APPEND BLENDER_SORTED_LIBS extern_glew)
endif()