Tamito Kajiyama ed0e2fbd9f Merged changes in the trunk up to revision 52690. ...

Conflicts resolved:
release/datafiles/startup.blend
source/blender/blenlib/intern/bpath.c

2012-12-01 02:47:59 +00:00

..

binreloc

update gpl header in cmake files

2012-02-11 04:05:00 +00:00

bullet2

Patch Bullet to make it's convex hull implementation usable in BMesh

2012-10-23 23:54:02 +00:00

carve

Fix/workaround for carve aborts on windows

2012-11-05 11:34:53 +00:00

colamd

update gpl header in cmake files

2012-02-11 04:05:00 +00:00

Eigen3

Update to stable Eigen 3.1.1

2012-10-15 16:29:23 +00:00

glew

OSX: substitute all MAC_OS_X_VERSION defines with MAC_OS_X_VERSION_MIN_REQUIRED macros, to get more reliable version (api) covering

2012-11-06 15:19:49 +00:00

libmv

Merged changes in the trunk up to revision 52546.

2012-11-26 02:32:34 +00:00

libopenjpeg

add cmake option WITH_SYSTEM_OPENJPEG so linux can build cycles without having libopenjpeg installed.

2012-06-23 14:23:44 +00:00

libredcode

style cleanup

2012-05-27 00:36:50 +00:00

lzma

update gpl header in cmake files

2012-02-11 04:05:00 +00:00

lzo

update gpl header in cmake files

2012-02-11 04:05:00 +00:00

recastnavigation

style cleanup

2012-10-20 18:46:57 +00:00

xdnd

Fix #33192: Opening Blender breaks drag-and-drop support on the KDE desktop

2012-11-15 20:50:48 +00:00

CMakeLists.txt

remove unmaintained eltopo, keeping scons/cmake entries, but commenting out user visible config to make branch merging less of a hassle.

2012-11-27 09:52:20 +00:00

SConscript

remove unmaintained eltopo, keeping scons/cmake entries, but commenting out user visible config to make branch merging less of a hassle.

2012-11-27 09:52:20 +00:00