kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity
f03257cc1f
blender/release
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
..
datafiles Updated icons. Changed some icon names that weren't blank. 2009-10-15 13:47:18 +00:00
freedesktop * blender doesn't need the -w anymore to start in a window 2009-02-28 09:25:42 +00:00
irix-6.2-mips 2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r19323:HEAD 2009-04-20 15:06:46 +00:00
plugins Patch 17403, small gcc warning fixes. 2008-09-20 12:28:01 +00:00
scripts Merge of the COLLADA GSoC branch into trunk. 2009-10-30 15:35:50 +00:00
test 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
text Updated python license, this is compatible with current 2.5 and older. 2008-10-11 15:55:22 +00:00
windows 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
environment-macosx Continue development of bfile system. 2009-10-19 18:44:09 +00:00
environment-mswindows Continue development of bfile system. 2009-10-19 18:44:09 +00:00
environment-unix Continue development of bfile system. 2009-10-19 18:44:09 +00:00
getversion.py Slight improvements in release creation. 2009-04-11 19:04:59 +00:00
Makefile - removed 2.4x release/scripts 2009-09-28 03:19:52 +00:00
VERSION Part 1 of the 2.49b commit 2009-08-31 18:16:18 +00:00