Campbell Barton bf4deba4d5 svn merge ^/trunk/blender -r42927:42931

2011-12-28 14:05:02 +00:00

..

avi

style edit only - move parenthesis onto second line of function definition (in keeping with most of blenders code)

2011-12-17 00:52:36 +00:00

blenfont

* Fixing compile after recent i18 commits.

2011-12-27 01:35:39 +00:00

blenkernel

svn merge ^/trunk/blender -r42927:42931

2011-12-28 14:05:02 +00:00

blenlib

svn merge ^/trunk/blender -r42927:42931

2011-12-28 14:05:02 +00:00

blenloader

svn merge ^/trunk/blender -r42927:42931

2011-12-28 14:05:02 +00:00

blenpluginapi

svn merge -r41287:41310 ^/trunk/blender note, mirror modifier had slow, per vertex name flipping, replaced with flip_map from trunk

2011-10-27 09:42:03 +00:00

bmesh

remove some redundant lines of code.

2011-12-21 07:36:30 +00:00

collada

svn merge ^/trunk/blender -r42669:42670

2011-12-16 23:50:55 +00:00

editors

svn merge ^/trunk/blender -r42927:42931

2011-12-28 14:05:02 +00:00

gpu

svn merge ^/trunk/blender -r42778:42839

2011-12-23 08:41:53 +00:00

ikplugin

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

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

imbuf

Code refactoring: add unified image buffer functions for doing float => byte,

2011-12-28 13:29:33 +00:00

makesdna

svn merge ^/trunk/blender -r42927:42931

2011-12-28 14:05:02 +00:00

makesrna

svn merge ^/trunk/blender -r42839:42871

2011-12-25 21:31:19 +00:00

modifiers

svn merge ^/trunk/blender -r42918:42920

2011-12-28 11:20:45 +00:00

nodes

Code refactoring: add unified image buffer functions for doing float => byte,

2011-12-28 13:29:33 +00:00

python

WIP loading bmesh in trunk, some conversion functions for this purpose.

2011-12-28 13:50:33 +00:00

quicktime

OSX: adding PNG codec to QTKit, to have one more alpha enabled one atm

2011-12-27 11:29:27 +00:00

render

svn merge ^/trunk/blender -r42927:42931

2011-12-28 14:05:02 +00:00

windowmanager

svn merge ^/trunk/blender -r42927:42931

2011-12-28 14:05:02 +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