Arystanbek Dyussenov 71a2cc3222 Merge from trunk -r 24758:25003.

2009-11-29 18:54:37 +00:00

..

blender

Merge from trunk -r 24758:25003.

2009-11-29 18:54:37 +00:00

blenderplayer

py/rna api

2009-11-28 13:33:56 +00:00

creator

Splash screen, implemented by Matt.

2009-11-23 13:58:55 +00:00

darwin

Merge from trunk -r 22040:23000.

2009-10-19 16:20:12 +00:00

gameengine

BGE: ray casting works on soft body, the hit polygon is also returned. The modifications to Bullet have been reported to Bullet forum. Note: welding is completely disabled on soft body as it breaks the relationship between the soft body collision shape and the graphics mesh without bringing any additional stability (the reverse actually).

2009-11-28 17:30:34 +00:00

icons

Merge from trunk -r 22040:23000.

2009-10-19 16:20:12 +00:00

kernel

Merge from trunk -r 22040:23000.

2009-10-19 16:20:12 +00:00

CMakeLists.txt

Undo revision 23130 which was a merge with 2.5, a messy one because I did something wrong (svn status output: http://www.pasteall.org/7887).

2009-09-15 18:01:18 +00:00

Makefile

Add FFTW3 support to Makefiles, make OpenJpeg use OS lib for Linux.

2009-11-09 20:08:19 +00:00

nan_compile.mk

- remove CPPFLAG XP_UNIX from CMake, Scons and Irix make, checked our own code and /usr/include, its only used in our netscape plugin.

2009-11-19 11:49:42 +00:00

nan_definitions.mk

Add FFTW3 support to Makefiles, make OpenJpeg use OS lib for Linux.

2009-11-09 20:08:19 +00:00

nan_link.mk

Add FFTW3 support to Makefiles, make OpenJpeg use OS lib for Linux.

2009-11-09 20:08:19 +00:00

nan_subdirs.mk

Makefile updates for Blender 2.5 (from GSR)

2009-03-19 01:50:45 +00:00

nan_warn.mk

Update condition checks to match user definable CC and CCC.

2009-09-20 20:21:01 +00:00

SConscript

Merge from trunk -r 22040:23000.

2009-10-19 16:20:12 +00:00