Arystanbek Dyussenov fa0041de8d Fixed support for building without collada (scons and cmake). Only tested scons. ...

Re-enabled collada code building by default in cmake. Realized this should be off only in trunk.

2009-10-25 07:51:40 +00:00

..

avi

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

blenfont

Merge from trunk -r 22040:23000.

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

blenkernel

Merge from trunk -r 23000:23968.

2009-10-25 06:53:04 +00:00

blenlib

Merge from trunk -r 22040:23000.

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

blenloader

Merge from trunk -r 22040:23000.

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

blenpluginapi

Merge from trunk -r 22040:23000.

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

collada

Post-merge fixes in collada code.

2009-10-19 16:23:45 +00:00

editors

Merge from trunk -r 23000:23968.

2009-10-25 06:53:04 +00:00

gpu

Merge from trunk -r 22040:23000.

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

ikplugin

iTaSC: Selection of constrained axis for CopyPose constraint

2009-10-14 18:51:00 +00:00

imbuf

Merge from trunk -r 22040:23000.

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

makesdna

Merge from trunk -r 22040:23000.

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

makesrna

Merge from trunk -r 22040:23000.

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

nodes

Merge from trunk -r 22040:23000.

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

python

Merge from trunk -r 22040:23000.

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

quicktime

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

readblenfile

Merge from trunk -r 22040:23000.

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

render

Merge from trunk -r 22040:23000.

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

verify

Patch from GSR that a) fixes a whole bunch of GPL/BL license

2008-04-16 22:40:48 +00:00

windowmanager

Fixed support for building without collada (scons and cmake). Only tested scons.

2009-10-25 07:51:40 +00:00

CMakeLists.txt

Merge from trunk -r 23000:23968.

2009-10-25 06:53:04 +00:00

Makefile

Merge of itasc branch. Project files, scons and cmake should be working. Makefile updated but not tested. Comes with Eigen2 2.0.6 C++ matrix library.

2009-09-24 21:22:24 +00:00

SConscript

Merge from trunk -r 23000:23968.

2009-10-25 06:53:04 +00:00