kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity
31258507d0
blender/source/blender
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
..
avi 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
blenfont Compiler warning fixes for mingw: 2009-10-27 09:38:15 +00:00
blenkernel New Track To Constraint: "Damped" 2009-10-30 06:33:40 +00:00
blenlib - Simplified EulToGimbalAxis, its still only works on XYZ and ZXY but at least its more clear whats going on. 2009-10-30 12:11:04 +00:00
blenloader Added support for custom RNA properties on Bones, only worked for 2009-10-28 15:33:45 +00:00
blenpluginapi Fix cmake compilation on Windows, adding pthread includes, 2009-10-01 17:24:24 +00:00
collada Merge of the COLLADA GSoC branch into trunk. 2009-10-30 15:35:50 +00:00
editors own commit r24178 broke adding objects, need to look into why but this fixes for now 2009-10-30 13:26:29 +00:00
gpu OpenGL Render restored. 2009-10-28 18:03:04 +00:00
ikplugin Fixes to get Blender compile and run on PowerPC OSX 10.3, gcc 3.3 2009-10-20 15:51:18 +00:00
imbuf SVN maintenance. 2009-10-29 18:37:34 +00:00
makesdna New Track To Constraint: "Damped" 2009-10-30 06:33:40 +00:00
makesrna New Track To Constraint: "Damped" 2009-10-30 06:33:40 +00:00
nodes Make compiler happy, remove doubtful non init usage. 2009-10-21 17:56:26 +00:00
python updating mathutils wrapped attributes now runs rna update functions too 2009-10-30 13:58:43 +00:00
quicktime 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
readblenfile 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
render Make compiler happy, remove doubtful non init usage. 2009-10-21 17:56:26 +00:00
verify Patch from GSR that a) fixes a whole bunch of GPL/BL license 2008-04-16 22:40:48 +00:00
windowmanager Merge of the COLLADA GSoC branch into trunk. 2009-10-30 15:35:50 +00:00
CMakeLists.txt Merge of the COLLADA GSoC branch into trunk. 2009-10-30 15:35:50 +00:00
Makefile Merge of itasc branch. Project files, scons and cmake should be working. Makefile updated but not tested. Comes with Eigen2 2.0.6 C++ matrix library. 2009-09-24 21:22:24 +00:00
SConscript Merge of the COLLADA GSoC branch into trunk. 2009-10-30 15:35:50 +00:00