svn merge -r 22571:22800 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorAndre Susano Pinto <andresusanopinto@gmail.com>
Tue, 15 Sep 2009 15:34:00 +0000 (15:34 +0000)
committerAndre Susano Pinto <andresusanopinto@gmail.com>
Tue, 15 Sep 2009 15:34:00 +0000 (15:34 +0000)
commitc8dfa6071d58ed514877d6444fed0815bf63153c
treeafa083927b184ec4084c6f362815321e98abe205
parentf7c686d0ae68842feddd4f37deadab12e1fa4991
parent0338b05a64184ce1a439a418ebc4e315185c1eec
svn merge -r 22571:22800 https://svn.blender.org/svnroot/bf-blender/trunk/blender
svn merge -r 22800:23207 https://svn.blender.org/svnroot/bf-blender/trunk/blender

Merged volumetric with new raytrace code (it compiles and rendered volume-cube.blend withouth problems)

Part 2:
everything except source/blender (merged on part1)
blenderplayer/CMakeLists.txt
release/ui/buttons_scene.py