Blender Git Commit Log

Git Commits -> Revision 3125850

Revision 3125850 by Arystanbek Dyussenov (master)
October 30, 2009, 15:35 (GMT)
Merge of the COLLADA GSoC branch into trunk.

COLLADA code is disabled by default (it has dependencies requiring manual install).

SCons and CMake builds are supported on Windows and Linux, no Mac building yet. More on building COLLADA code: http://wiki.blender.org/index.php/User:Kazanbas/Building_Collada_Branch.

The detailed command log of the merge (can be useful for educational purposes):

branch=https://svn.blender.org/svnroot/bf-blender/branches/soc-2009-chingachgook
# collada code
svn copy $branch/source/blender/collada source/blender/collada
# operator
svn merge -c 20401,20955,21077,24077,24079 $branch/source/blender/windowmanager/intern/wm_operators.c source/blender/windowmanager/intern/wm_operators.c
# menu
svn merge -c 24079 $branch/release/scripts/ui/space_info.py release/scripts/ui/space_info.py
# scons
svn merge -c 20398 $branch/source/blender/SConscript source/blender/SConscript
svn merge -c 20398,20691,20955,22726 $branch/tools/btools.py tools/btools.py
svn merge -c 20691,20955,22726 $branch/tools/Blender.py tools/Blender.py
svn merge -c 20398,20692,20955 $branch/config/linux2-config.py config/linux2-config.py
svn merge -c 22726 $branch/config/win64-vc-config.py config/win64-vc-config.py
svn merge -c 22726 $branch/config/win32-vc-config.py config/win32-vc-config.py
svn merge -c 24077 $branch/source/blender/windowmanager/SConscript source/blender/windowmanager/SConscript
# cmake
svn merge -c 23319,23905,24077,24158 $branch/CMakeLists.txt CMakeLists.txt
svn merge -c 23319 $branch/source/blender/CMakeLists.txt source/blender/CMakeLists.txt
svn merge -c 23319 $branch/source/creator/CMakeLists.txt source/creator/CMakeLists.txt
svn merge -c 23319 $branch/CMake/macros.cmake CMake/macros.cmake
svn merge -c 24077 $branch/source/blender/windowmanager/CMakeLists.txt source/blender/windowmanager/CMakeLists.txt

Commit Details:

Full Hash: 31258507d047d6594a97fc99496855d6d1a83d5b
SVN Revision: 24182
Parent Commit: 84eb897
Lines Changed: +5377, -3

9 Added Paths:

/source/blender/collada/CMakeLists.txt (+44, -0) (View)
/source/blender/collada/collada.cpp (+26, -0) (View)
/source/blender/collada/collada.h (+19, -0) (View)
/source/blender/collada/collada_internal.h (+69, -0) (View)
/source/blender/collada/DocumentExporter.cpp (+2137, -0) (View)
/source/blender/collada/DocumentExporter.h (+8, -0) (View)
/source/blender/collada/DocumentImporter.cpp (+2847, -0) (View)
/source/blender/collada/DocumentImporter.h (+8, -0) (View)
/source/blender/collada/SConscript (+10, -0) (View)

14 Modified Paths:

/CMake/macros.cmake (+10, -0) (Diff)
/CMakeLists.txt (+14, -0) (Diff)
/config/linux2-config.py (+14, -0) (Diff)
/config/win32-vc-config.py (+10, -0) (Diff)
/config/win64-vc-config.py (+10, -0) (Diff)
/release/scripts/ui/space_info.py (+2, -2) (Diff)
/source/blender/CMakeLists.txt (+4, -0) (Diff)
/source/blender/SConscript (+3, -0) (Diff)
/source/blender/windowmanager/CMakeLists.txt (+4, -0) (Diff)
/source/blender/windowmanager/intern/wm_operators.c (+106, -0) (Diff)
/source/blender/windowmanager/SConscript (+3, -0) (Diff)
/source/creator/CMakeLists.txt (+2, -1) (Diff)
/tools/Blender.py (+11, -0) (Diff)
/tools/btools.py (+16, -0) (Diff)
By: Miika HämäläinenLast update: Nov-07-2014 14:18MiikaHweb | 2003-2021