Tamito Kajiyama 1f7ae143a2 Merged changes in the trunk up to revision 48227. ...

Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_file/filelist.c

2012-06-24 10:29:26 +00:00

..

binreloc

update gpl header in cmake files

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

bullet2

Update Bullet to version 2.80 (bullet svn revision 2537)

2012-06-08 16:13:01 +00:00

carve

Style cleanup: use 2 spaces for indentation in bundle scripts

2012-05-10 11:17:15 +00:00

colamd

update gpl header in cmake files

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

Eigen3

Update Eigen3 library, would be needed for some further integraiton.

2012-05-09 08:33:05 +00:00

glew

update gpl header in cmake files

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

libmv

Merged changes in the trunk up to revision 47977.

2012-06-15 22:18:25 +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-06-17 09:58:26 +00:00

xdnd

Drag-n-drop support on Linux

2012-02-17 16:58:09 +00:00

CMakeLists.txt

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

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

SConscript

XDND support now can be disabled using WITH_GHOST_XDND=OFF with CMake and WITH_GHOST_XDND=False with SCons

2012-02-17 20:51:39 +00:00