Blender Git Loki

Git Commits -> Revision a42bf45

Revision a42bf45 by Campbell Barton (master)
April 12, 2011, 11:09 (GMT)
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

Commit Details:

Full Hash: a42bf453335bdd569556895a168bced1fa7b3c3c
SVN Revision: 36110
Parent Commit: b7269aa
Lines Changed: +7, -728

10 Modified Paths:

/build_files/cmake/FindPythonLibsUnix.cmake (+1, -1) (Diff)
/build_files/scons/tools/btools.py (+1, -3) (Diff)
/extern/CMakeLists.txt (+0, -4) (Diff)
/extern/SConscript (+0, -3) (Diff)
/source/blender/blenkernel/BKE_collision.h (+1, -12) (Diff)
/source/blender/blenkernel/CMakeLists.txt (+1, -6) (Diff)
/source/blender/blenkernel/intern/collision.c (+3, -687) (Diff)
/source/blender/blenkernel/SConscript (+0, -4) (Diff)
/source/blenderplayer/CMakeLists.txt (+0, -4) (Diff)
/source/creator/CMakeLists.txt (+0, -4) (Diff)
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021