forked from bartvdbraak/blender
bdfe7d89e2
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r12987:17416 Issues: * GHOST/X11 had conflicting changes. Some code was added in 2.5, which was later added in trunk also, but reverted partially, specifically revision 16683. I have left out this reversion in the 2.5 branch since I think it is needed there. http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16683 * Scons had various conflicting changes, I decided to go with trunk version for everything except priorities and some library renaming. * In creator.c, there were various fixes and fixes for fixes related to the -w -W and -p options. In 2.5 -w and -W is not coded yet, and -p is done differently. Since this is changed so much, and I don't think those fixes would be needed in 2.5, I've left them out. * Also in creator.c: there was code for a python bugfix where the screen was not initialized when running with -P. The code that initializes the screen there I had to disable, that can't work in 2.5 anymore but left it commented as a reminder. Further I had to disable some new function calls. using src/ and python/, as was done already in this branch, disabled function calls: * bpath.c: error reporting * BME_conversions.c: editmesh conversion functions. * SHD_dynamic: disabled almost completely, there is no python/. * KX_PythonInit.cpp and Ketsji/ build files: Mathutils is not there, disabled. * text.c: clipboard copy call. * object.c: OB_SUPPORT_MATERIAL. * DerivedMesh.c and subsurf_ccg, stipple_quarttone. Still to be done: * Go over files and functions that were moved to a different location but could still use changes that were done in trunk. |
||
|---|---|---|
| bin/.blender | ||
| blenderplayer | ||
| CMake | ||
| config | ||
| doc | ||
| extern | ||
| intern | ||
| po | ||
| projectfiles | ||
| projectfiles_vc7 | ||
| projectfiles_vc9 | ||
| release | ||
| source | ||
| tools | ||
| CMakeLists.txt | ||
| COPYING | ||
| Makefile | ||
| README | ||
| SConstruct | ||
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