Arystanbek Dyussenov 58e44463fb Merge from trunk -r 24247:24313, -r 24313:24390.

2009-11-07 14:21:07 +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

Compiler warning fixes for mingw:

2009-10-27 09:38:15 +00:00

blenkernel

Merge from trunk -r 24247:24313, -r 24313:24390.

2009-11-07 14:21:07 +00:00

blenlib

Merge from trunk -r 24182:24247. Skipped change 24182 (merge of this branch into trunk).

2009-11-02 17:35:23 +00:00

blenloader

Merge from trunk -r 24247:24313, -r 24313:24390.

2009-11-07 14:21:07 +00:00

blenpluginapi

Merge from trunk -r 22040:23000.

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

collada

Fixed object-based rotation animation input/output. Still need to fix bone rotation i/o.

2009-11-04 15:03:26 +00:00

editors

Merge from trunk -r 24247:24313, -r 24313:24390.

2009-11-07 14:21:07 +00:00

gpu

OpenGL Render restored.

2009-10-28 18:03:04 +00:00

ikplugin

Merge from trunk -r 24182:24247. Skipped change 24182 (merge of this branch into trunk).

2009-11-02 17:35:23 +00:00

imbuf

Merge from trunk -r 24182:24247. Skipped change 24182 (merge of this branch into trunk).

2009-11-02 17:35:23 +00:00

makesdna

Merge from trunk -r 24247:24313, -r 24313:24390.

2009-11-07 14:21:07 +00:00

makesrna

Merge from trunk -r 24247:24313, -r 24313:24390.

2009-11-07 14:21:07 +00:00

nodes

Make compiler happy, remove doubtful non init usage.

2009-10-21 17:56:26 +00:00

python

Merge from trunk -r 24247:24313, -r 24313:24390.

2009-11-07 14:21:07 +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 24247:24313, -r 24313:24390.

2009-11-07 14:21:07 +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

Merge from trunk -r 24247:24313, -r 24313:24390.

2009-11-07 14:21:07 +00:00

CMakeLists.txt

Merge of the COLLADA GSoC branch into trunk.

2009-10-30 15:35:50 +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 of the COLLADA GSoC branch into trunk.

2009-10-30 15:35:50 +00:00