Another big-ass 450K commit msg. Summarized for your convenience. -- Stephen Swaney [EMAIL PROTECTED]
-------------------------------------------------------------- From: Brecht Van Lommel <[EMAIL PROTECTED]> To: bf-blender-cvs@blender.org Subject: SVN commit: /data/svn/bf-blender [17433] branches/blender2.5/blender: Reply-To: [EMAIL PROTECTED] X-Mailer: SVN::Notify 2.65: http://search.cpan.org/dist/SVN-Notify/ Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <[EMAIL PROTECTED]> Date: Wed, 12 Nov 2008 22:17:07 +0100 (CET) Revision: 17433 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17433 Author: blendix Date: 2008-11-12 22:16:53 +0100 (Wed, 12 Nov 2008) Log Message: ----------- Merge of trunk into blender 2.5: 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. Revision Links: -------------- http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16683 Modified Paths: -------------- branches/blender2.5/blender/CMake/macros.cmake branches/blender2.5/blender/CMakeLists.txt branches/blender2.5/blender/Makefile branches/blender2.5/blender/README branches/blender2.5/blender/SConstruct branches/blender2.5/blender/bin/.blender/.Blanguages branches/blender2.5/blender/bin/.blender/locale/ar/LC_MESSAGES/blender.mo branches/blender2.5/blender/bin/.blender/locale/bg/LC_MESSAGES/blender.mo branches/blender2.5/blender/bin/.blender/locale/ca/LC_MESSAGES/blender.mo branches/blender2.5/blender/bin/.blender/locale/cs/LC_MESSAGES/blender.mo branches/blender2.5/blender/bin/.blender/locale/de/LC_MESSAGES/blender.mo branches/blender2.5/blender/bin/.blender/locale/es/LC_MESSAGES/blender.mo branches/blender2.5/blender/bin/.blender/locale/fi/LC_MESSAGES/blender.mo branches/blender2.5/blender/bin/.blender/locale/fr/LC_MESSAGES/blender.mo branches/blender2.5/blender/bin/.blender/locale/hr/LC_MESSAGES/blender.mo branches/blender2.5/blender/bin/.blender/locale/it/LC_MESSAGES/blender.mo branches/blender2.5/blender/bin/.blender/locale/ja/LC_MESSAGES/blender.mo branches/blender2.5/blender/bin/.blender/locale/nl/LC_MESSAGES/blender.mo branches/blender2.5/blender/bin/.blender/locale/pl/LC_MESSAGES/blender.mo branches/blender2.5/blender/bin/.blender/locale/pt_BR/LC_MESSAGES/blender.mo branches/blender2.5/blender/bin/.blender/locale/ro/LC_MESSAGES/blender.mo branches/blender2.5/blender/bin/.blender/locale/ru/LC_MESSAGES/blender.mo branches/blender2.5/blender/bin/.blender/locale/sr/LC_MESSAGES/blender.mo branches/blender2.5/blender/bin/.blender/locale/[EMAIL PROTECTED]/LC_MESSAGES/blender.mo branches/blender2.5/blender/bin/.blender/locale/sv/LC_MESSAGES/blender.mo branches/blender2.5/blender/bin/.blender/locale/uk/LC_MESSAGES/blender.mo branches/blender2.5/blender/bin/.blender/locale/zh_CN/LC_MESSAGES/blender.mo branches/blender2.5/blender/blenderplay [trimmed] _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs