Mitchell Stokes 648dec3411 Fix for bug #25804 (LibLoad'ed scene objects material CRASH when doing mat.getShader()) ...

X_Material's mScene member variable wasn't properly set on merge if it didn't have an mBlenderShader defined. This patch always makes sure it gets set on merge.

2011-02-21 23:41:47 +00:00

..

BlenderRoutines

remove nan-makefiles

2011-01-30 15:29:22 +00:00

Converter

Remove header include, conflicts otherwise with BLI_math.h

2011-02-18 14:30:36 +00:00

Expressions

BGE Expressions: convert "\n" to real \n

2011-02-18 10:10:48 +00:00

GameLogic

remove nan-makefiles

2011-01-30 15:29:22 +00:00

GamePlayer

Fix #26064: blenderplayer is broken

2011-02-13 10:28:40 +00:00

Ketsji

Fix for bug #25804 (LibLoad'ed scene objects material CRASH when doing mat.getShader())

2011-02-21 23:41:47 +00:00

Network

remove nan-makefiles

2011-01-30 15:29:22 +00:00

Physics

remove nan-makefiles

2011-01-30 15:29:22 +00:00

PyDoc

== python api doc ==

2010-10-13 10:42:33 +00:00

Rasterizer

minor edits, no functional changes.

2011-02-07 22:48:23 +00:00

SceneGraph

remove nan-makefiles

2011-01-30 15:29:22 +00:00

VideoTexture

remove nan-makefiles

2011-01-30 15:29:22 +00:00

CMakeLists.txt

use cmake defined names for jpeg, png, zlib and python libs, building on *nix with non-standard libjpeg/png/zlib locations was broken.

2011-01-25 14:43:13 +00:00

SConscript

enable building the game engine without bullet for scons & cmake

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