Brecht Van Lommel 3a9dcf1fea Sculpt Branch: ...

svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r25245:25315

2009-12-11 14:38:02 +00:00

..

blender

Sculpt Branch:

2009-12-11 14:38:02 +00:00

blenderplayer

align option for split

2009-12-10 14:47:07 +00:00

creator

-noaudio option to force the sound system to None.

2009-12-07 20:39:57 +00:00

darwin

- removed 2.4x release/scripts

2009-09-28 03:19:52 +00:00

gameengine

BGE: Add plot method to VideoTexture.ImageBuff class.

2009-12-08 10:02:22 +00:00

icons

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

kernel

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

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

Move libpython.a to COMLIB (before was PULIB).

2009-12-09 17:53:52 +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

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