Campbell Barton 48006292d8 svn merge ^/trunk/blender -r44189:44204

2012-02-17 20:56:25 +00:00

..

avi

unify include guard defines, __$FILENAME__

2012-02-17 18:59:41 +00:00

blenfont

unify include guard defines, __$FILENAME__

2012-02-17 18:59:41 +00:00

blenkernel

svn merge ^/trunk/blender -r44189:44204

2012-02-17 20:56:25 +00:00

blenlib

svn merge ^/trunk/blender -r44189:44204

2012-02-17 20:56:25 +00:00

blenloader

svn merge ^/trunk/blender -r44189:44204

2012-02-17 20:56:25 +00:00

blenpluginapi

svn merge ^/trunk/blender -r44189:44204

2012-02-17 20:56:25 +00:00

bmesh

correct for bad assumption in recent commit. angle_v3v3v3 was working as intended.

2012-02-16 20:17:45 +00:00

collada

svn merge ^/trunk/blender -r44189:44204

2012-02-17 20:56:25 +00:00

editors

svn merge ^/trunk/blender -r44189:44204

2012-02-17 20:56:25 +00:00

gpu

svn merge ^/trunk/blender -r44189:44204

2012-02-17 20:56:25 +00:00

ikplugin

unify include guard defines, __$FILENAME__

2012-02-17 18:59:41 +00:00

imbuf

unify include guard defines, __$FILENAME__

2012-02-17 18:59:41 +00:00

makesdna

svn merge ^/trunk/blender -r44189:44204

2012-02-17 20:56:25 +00:00

makesrna

svn merge ^/trunk/blender -r44189:44204

2012-02-17 20:56:25 +00:00

modifiers

svn merge ^/trunk/blender -r44189:44204

2012-02-17 20:56:25 +00:00

nodes

unify include guard defines, __$FILENAME__

2012-02-17 18:59:41 +00:00

python

patch [#30227] Various MSVC (32-bit) Warning and Typo Fixes

2012-02-17 19:21:47 +00:00

quicktime

unify include guard defines, __$FILENAME__

2012-02-17 18:59:41 +00:00

render

svn merge ^/trunk/blender -r44189:44204

2012-02-17 20:56:25 +00:00

windowmanager

svn merge ^/trunk/blender -r44189:44204

2012-02-17 20:56:25 +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