bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity
31258507d0
blender/source
History
Arystanbek Dyussenov 31258507d0 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
2009-10-30 15:35:50 +00:00
..
blender Merge of the COLLADA GSoC branch into trunk. 2009-10-30 15:35:50 +00:00
blenderplayer remove C specials menus, reuse python ones from the header menu instead. 2009-10-12 21:06:03 +00:00
creator Merge of the COLLADA GSoC branch into trunk. 2009-10-30 15:35:50 +00:00
darwin - removed 2.4x release/scripts 2009-09-28 03:19:52 +00:00
gameengine BGE patch #19751: Add game actuator like methods to GameLogic. 2009-10-29 21:59:31 +00:00
icons Undo revision 23130 which was a merge with 2.5, a messy one because I did something wrong (svn status output: http://www.pasteall.org/7887). 2009-09-15 18:01:18 +00:00
kernel Undo revision 23130 which was a merge with 2.5, a messy one because I did something wrong (svn status output: http://www.pasteall.org/7887). 2009-09-15 18:01:18 +00:00
CMakeLists.txt Undo revision 23130 which was a merge with 2.5, a messy one because I did something wrong (svn status output: http://www.pasteall.org/7887). 2009-09-15 18:01:18 +00:00
Makefile Add raytrace subdir to Makefiles. 2009-10-06 17:01:00 +00:00
nan_compile.mk Fixes to get Blender compile and run on PowerPC OSX 10.3, gcc 3.3 2009-10-20 15:51:18 +00:00
nan_definitions.mk still doesn't work but this fixes make clean 2009-09-25 04:25:40 +00:00
nan_link.mk Added in runtime path for python since were using a dynamic lib. 2009-09-11 14:31:05 +00:00
nan_subdirs.mk
nan_warn.mk Update condition checks to match user definable CC and CCC. 2009-09-20 20:21:01 +00:00
SConscript Undo revision 23130 which was a merge with 2.5, a messy one because I did something wrong (svn status output: http://www.pasteall.org/7887). 2009-09-15 18:01:18 +00:00