Joseph Eagar ed12e1978f pre-merge commit

2010-01-11 23:09:46 +00:00

..

avi

merge with 2.5/trunk at r23271

2009-09-16 17:43:09 +00:00

blenfont

Fixes for martin's background mode commit - now works fine here on OS X

2009-11-11 04:38:37 +00:00

blenkernel

Merge with trunk/2.5 at r25563

2010-01-05 22:33:41 +00:00

blenlib

Merge with trunk/2.5 at r25563

2010-01-05 22:33:41 +00:00

blenloader

Merge with trunk/2.5 at r25563

2010-01-05 22:33:41 +00:00

blenpluginapi

merge with trunk/2.5 at r23876

2009-10-22 23:22:05 +00:00

bmesh

pre-merge commit; decided might as well get it over with.

2009-12-26 08:47:38 +00:00

collada

MSVC 9 compile fixes and cleanups

2009-12-13 17:46:30 +00:00

editors

bmesh compile fixes

2010-01-07 14:31:51 +00:00

gpu

Merge with trunk/2.5 at r25563

2010-01-05 22:33:41 +00:00

ikplugin

did math lib conversion, equivilent to merge with trunk/2.5 at r24464

2009-11-23 14:41:22 +00:00

imbuf

ImBuf: Fix bug in clipping

2009-12-08 08:44:18 +00:00

makesdna

Merge with trunk/2.5 at r25563

2010-01-05 22:33:41 +00:00

makesrna

pre-merge commit

2010-01-11 23:09:46 +00:00

nodes

Fix bug #20299: bilateral blur node crashes when the number of

2009-12-09 17:18:39 +00:00

python

Merge with trunk/2.5 at r25563

2010-01-05 22:33:41 +00:00

quicktime

Fix compilation of carbon quicktime & complete use of report mechanism instead of standard printf

2009-12-23 11:49:07 +00:00

readblenfile

merge with 2.5/trunk at r23271

2009-09-16 17:43:09 +00:00

render

Merge with trunk/2.5 at r25563

2010-01-05 22:33:41 +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 with trunk/2.5 at r25563

2010-01-05 22:33:41 +00:00

CMakeLists.txt

merge with trunk/2.5 at r24378

2009-11-07 23:10:18 +00:00

Makefile

merge with trunk/2.5 at r23876

2009-10-22 23:22:05 +00:00

SConscript

merge with trunk/2.5 at r24378

2009-11-07 23:10:18 +00:00