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. |
||
|---|---|---|
| .. | ||
| GHOST_Buttons.cpp | ||
| GHOST_Buttons.h | ||
| GHOST_C-api.cpp | ||
| GHOST_CallbackEventConsumer.cpp | ||
| GHOST_CallbackEventConsumer.h | ||
| GHOST_Debug.h | ||
| GHOST_DisplayManager.cpp | ||
| GHOST_DisplayManager.h | ||
| GHOST_DisplayManagerCarbon.cpp | ||
| GHOST_DisplayManagerCarbon.h | ||
| GHOST_DisplayManagerWin32.cpp | ||
| GHOST_DisplayManagerWin32.h | ||
| GHOST_DisplayManagerX11.cpp | ||
| GHOST_DisplayManagerX11.h | ||
| GHOST_Event.h | ||
| GHOST_EventButton.h | ||
| GHOST_EventCursor.h | ||
| GHOST_EventKey.h | ||
| GHOST_EventManager.cpp | ||
| GHOST_EventManager.h | ||
| GHOST_EventNDOF.h | ||
| GHOST_EventPrinter.cpp | ||
| GHOST_EventPrinter.h | ||
| GHOST_EventWheel.h | ||
| GHOST_ISystem.cpp | ||
| GHOST_ModifierKeys.cpp | ||
| GHOST_ModifierKeys.h | ||
| GHOST_NDOFManager.cpp | ||
| GHOST_NDOFManager.h | ||
| GHOST_Rect.cpp | ||
| GHOST_System.cpp | ||
| GHOST_System.h | ||
| GHOST_SystemCarbon.cpp | ||
| GHOST_SystemCarbon.h | ||
| GHOST_SystemWin32.cpp | ||
| GHOST_SystemWin32.h | ||
| GHOST_SystemX11.cpp | ||
| GHOST_SystemX11.h | ||
| GHOST_TimerManager.cpp | ||
| GHOST_TimerManager.h | ||
| GHOST_TimerTask.h | ||
| GHOST_Window.cpp | ||
| GHOST_Window.h | ||
| GHOST_WindowCarbon.cpp | ||
| GHOST_WindowCarbon.h | ||
| GHOST_WindowManager.cpp | ||
| GHOST_WindowManager.h | ||
| GHOST_WindowWin32.cpp | ||
| GHOST_WindowWin32.h | ||
| GHOST_WindowX11.cpp | ||
| GHOST_WindowX11.h | ||
| Makefile | ||