Campbell Barton 16710fb3c2 svn merge -r36651:36672 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-05-13 16:55:07 +00:00

..

avi

converted more mixed tab/space indentations to tabs. only whitespace changes.

2011-04-21 15:53:30 +00:00

blenfont

minor cleanup: make functions static, use NULL for pointer comparisons,

2011-05-10 13:11:36 +00:00

blenkernel

svn merge -r36651:36672 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-05-13 16:55:07 +00:00

blenlib

svn merge -r36651:36672 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-05-13 16:55:07 +00:00

blenloader

svn merge -r36603:36651 https://svn.blender.org/svnroot/bf-blender/trunk/blender \nwith some manual edits

2011-05-13 04:04:53 +00:00

blenpluginapi

=bmesh= merge from trunk at r36153

2011-04-15 01:19:13 +00:00

bmesh

svn merge -r36651:36672 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-05-13 16:55:07 +00:00

collada

=bmesh=

2011-05-07 02:48:14 +00:00

editors

remove unused vars

2011-05-13 13:17:30 +00:00

gpu

manually copy more changes from trunk.

2011-05-12 09:02:39 +00:00

ikplugin

copied across changes which were missed by merging.

2011-05-09 02:45:52 +00:00

imbuf

support for reading/writing image resolution (dpi), for PNG and TIFF,

2011-05-13 14:27:12 +00:00

makesdna

svn merge -r36603:36651 https://svn.blender.org/svnroot/bf-blender/trunk/blender \nwith some manual edits

2011-05-13 04:04:53 +00:00

makesrna

svn merge -r36651:36672 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-05-13 16:55:07 +00:00

modifiers

remove unused vars

2011-05-13 13:17:30 +00:00

nodes

Bugfix #27305

2011-05-10 16:30:03 +00:00

python

svn merge -r36583:36603 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-05-11 00:19:13 +00:00

quicktime

Fix [#26884] Console is not hidden when start blender

2011-04-20 12:04:07 +00:00

render

svn merge -r36603:36651 https://svn.blender.org/svnroot/bf-blender/trunk/blender \nwith some manual edits

2011-05-13 04:04:53 +00:00

windowmanager

svn merge -r36603:36651 https://svn.blender.org/svnroot/bf-blender/trunk/blender \nwith some manual edits

2011-05-13 04:04:53 +00:00

CMakeLists.txt

svn merge -r36603:36628 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-05-12 05:35:19 +00:00

SConscript

svn merge -r36603:36628 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-05-12 05:35:19 +00:00