Ove Murberg Henriksen 67dc5597b8 svn merge ^/trunk/blender -r46380:46390

2012-05-08 00:12:47 +00:00

..

avi

style cleanup: guys - set your editors to tabs!

2012-05-01 17:51:03 +00:00

blenfont

Renamed "fake" OpenGL identifiers.

2012-05-04 11:50:11 +00:00

blenkernel

svn merge ^/trunk/blender -r46380:46390

2012-05-08 00:12:47 +00:00

blenlib

svn merge ^/trunk/blender -r46330:46335

2012-05-07 22:28:59 +00:00

blenloader

svn merge ^/trunk/blender -r46330:46335

2012-05-07 22:28:59 +00:00

blenpluginapi

code cleanup: header cleanup

2012-04-30 14:24:11 +00:00

bmesh

svn merge ^/trunk/blender -r46360:46370

2012-05-07 23:40:17 +00:00

collada

svn merge ^/trunk/blender -r46370:46380

2012-05-08 00:09:00 +00:00

editors

svn merge ^/trunk/blender -r46380:46390

2012-05-08 00:12:47 +00:00

gpu

svn merge ^/trunk/blender -r46300:46330

2012-05-07 01:04:52 +00:00

ikplugin

code cleanup: naming - pose/armature/image

2012-05-05 16:03:57 +00:00

imbuf

Fix #31286: saving 16 bit BW tiff could crash due to invalid memory access. Also

2012-05-04 09:25:09 +00:00

makesdna

svn merge ^/trunk/blender -r46340:46350

2012-05-07 23:36:22 +00:00

makesrna

svn merge ^/trunk/blender -r46380:46390

2012-05-08 00:12:47 +00:00

modifiers

svn merge ^/trunk/blender -r46380:46390

2012-05-08 00:12:47 +00:00

nodes

svn merge ^/trunk/blender -r46300:46330

2012-05-07 01:04:52 +00:00

python

svn merge ^/trunk/blender -r46370:46380

2012-05-08 00:09:00 +00:00

quicktime

code cleanup: header cleanup

2012-04-30 14:24:11 +00:00

render

svn merge ^/trunk/blender -r46380:46390

2012-05-08 00:12:47 +00:00

windowmanager

svn merge ^/trunk/blender -r46370:46380

2012-05-08 00:09:00 +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