Campbell Barton 5ea86e1e2b svn merge ^/trunk/blender -r43995:44024

2012-02-11 04:10:50 +00:00

..

avi

Fix implicit declaration of guardedalloc functions in avi's endian.c.

2012-01-26 10:59:31 +00:00

blenfont

reverting commit [43876] Fix for aliased fonts in the game engine

2012-02-10 06:18:32 +00:00

blenkernel

Style Cleanup

2012-02-10 18:09:19 +00:00

blenlib

svn merge ^/trunk/blender -r43864:43887

2012-02-05 02:30:30 +00:00

blenloader

svn merge ^/trunk/blender -r43918:43934

2012-02-06 22:21:41 +00:00

blenpluginapi

svn merge ^/trunk/blender -r43564:43609

2012-01-22 18:04:35 +00:00

bmesh

Style Cleanup:

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

collada

svn merge ^/trunk/blender -r43887:43918

2012-02-05 22:13:10 +00:00

editors

Style Cleanup

2012-02-10 18:09:19 +00:00

gpu

svn merge ^/trunk/blender -r43995:44024

2012-02-11 04:10:50 +00:00

ikplugin

Math lib: matrix multiplication order fix for two functions that were

2011-12-16 19:53:12 +00:00

imbuf

Cache limiter will now work properly with limits >= 4Gb

2012-01-31 11:11:56 +00:00

makesdna

Code Cleanup:

2012-02-08 09:02:10 +00:00

makesrna

svn merge ^/trunk/blender -r43934:43976

2012-02-08 05:45:16 +00:00

modifiers

svn merge ^/trunk/blender -r43995:44024

2012-02-11 04:10:50 +00:00

nodes

Enable image and alpha outputs for image nodes by default. These were made unavailable for render layer nodes with the Combined pass disabled, but the same function also disabled them for image nodes. Fix for bug #30040.

2012-02-01 07:44:19 +00:00

python

correct 2 sphinx warnings.

2012-02-08 16:36:04 +00:00

quicktime

win32 quicktime: missing include. How comes nobody else got this problem?

2012-02-05 09:29:53 +00:00

render

svn merge ^/trunk/blender -r43934:43976

2012-02-08 05:45:16 +00:00

windowmanager

svn merge ^/trunk/blender -r43887:43918

2012-02-05 22:13:10 +00:00

CMakeLists.txt

svn merge ^/trunk/blender -r42372:42416

2011-12-04 18:39:19 +00:00

SConscript

svn merge -r41655:41715 ^/trunk/blender --- this is the real cycles merge, needs some edits to cycles its self before cycles will build

2011-11-10 04:17:43 +00:00