Go to file
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
bin/.blender Move Korean file from kr to ko also updated it to newer file. 2008-09-29 15:02:20 +00:00
CMake Merge of the COLLADA GSoC branch into trunk. 2009-10-30 15:35:50 +00:00
config Merge of the COLLADA GSoC branch into trunk. 2009-10-30 15:35:50 +00:00
doc * add Brecht's small patch to make values to BF_QUICK and BF_QUICKDEBUG function as partial search entries. 2008-11-09 21:00:49 +00:00
extern 64bit Mac: 2009-10-26 10:19:25 +00:00
intern Mac / COCOA : Imbuf 2009-10-29 18:06:49 +00:00
po Make verification of committed .mo files optional. 2009-09-15 22:34:10 +00:00
projectfiles 2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r19323:HEAD 2009-04-20 15:06:46 +00:00
projectfiles_vc7 2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r19323:HEAD 2009-04-20 15:06:46 +00:00
projectfiles_vc9 file browser 2009-10-19 19:26:28 +00:00
release Merge of the COLLADA GSoC branch into trunk. 2009-10-30 15:35:50 +00:00
source Merge of the COLLADA GSoC branch into trunk. 2009-10-30 15:35:50 +00:00
tools 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
COPYING Biiig commit! Thanks to 2-3 weeks of cvs freeze... 2004-12-27 19:28:52 +00:00
Makefile Some Makefile changes still laying around. 2009-04-21 17:24:16 +00:00
README Patch #17310: Fixing urls in main README 2008-07-12 06:18:06 +00:00
SConstruct Mac / COCOA : Imbuf 2009-10-29 18:06:49 +00:00

Welcome to the fun world of open source.

For instructions on building and installing Blender, please see the file named
INSTALL.


---------------------.Blanguages and the .blender directory---------------------

The .blender directory holds various data files for Blender.
In the 2.28a release those are the .Blanguages file containing a list of
translations, the translations themselves and a default ttf font.

Blender checks for the presence of this directory in several locations:
	- the current directory
	- your home directory
	- On OSX, the blender bundle is also checked 
	- On Windows, the installation dir is checked.

If you get a 'File ".Blanguages" not found' warning, try to copy the .blender
dir to one of these locations (your home directory being recommended).



-------------------------------------Links--------------------------------------

Getting Involved:
http://www.blender.org/community/get-involved

Community:
http://www.blender.org/Community

Main blender development site:
http://www.blender.org

The Blender project homepage:
http://projects.blender.org/projects/bf-blender

Documentation:
http://www.blender.org/education-help

Bug tracker:
http://www.blender.org/development/report-a-bug

Feature request tracker:
http://wiki.blender.org/index.php/Requests