Campbell Barton 348f116fe5 svn merge ^/trunk/blender -r43124:43160

2012-01-05 11:23:24 +00:00

..

BlenderRoutines

Cucumber, first batch of merge - UI changes and custom exit key

2011-12-20 03:11:56 +00:00

Converter

svn merge ^/trunk/blender -r43124:43160

2012-01-05 11:23:24 +00:00

Expressions

use PyUnicode_From_STR_String in the game engine in more places.

2011-12-30 12:44:16 +00:00

GameLogic

Fixes two crashers for games, with GHOST under SDL:

2012-01-02 12:35:06 +00:00

GamePlayer

Cleaning up the GPU_extensions_init/exit() code a bit to keep the Blenderplayer from crashing on exit and restart.

2011-12-23 07:10:01 +00:00

Ketsji

svn merge ^/trunk/blender -r43124:43160

2012-01-05 11:23:24 +00:00

Network

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

Physics

svn merge -r41751:41779 ^/trunk/blender

2011-11-15 02:05:32 +00:00

PyDoc

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

Rasterizer

bugfix: [#29486] 2D filters make scene disappear when wire material used - patch by Juha Mäki-Kanto

2011-12-17 21:23:02 +00:00

SceneGraph

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

VideoTexture

Add missing GLEW_STATIC definition, causing link errors.

2011-11-26 15:08:01 +00:00

CMakeLists.txt

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

SConscript

enable building the game engine without bullet for scons & cmake

2010-10-10 07:01:56 +00:00