svn merge -r 20651:20822 https://svn.blender.org/svnroot/bf-blender/branches/blender2...
authorAndre Susano Pinto <andresusanopinto@gmail.com>
Fri, 12 Jun 2009 02:29:38 +0000 (02:29 +0000)
committerAndre Susano Pinto <andresusanopinto@gmail.com>
Fri, 12 Jun 2009 02:29:38 +0000 (02:29 +0000)
commit1c9c278fa9b921af79602adc3ca1e14965647396
tree0b4902b21d169f755ef908805c90a4b4b16cf5d8
parentd198480db81f7efea85ee67c9ecedff9aaf5e2f5
parentec8b2593ecdee9493210df0e6f9c4dbbcb2a1985
svn merge -r 20651:20822 https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/blender
source/blender/render/intern/source/rayshade.c
source/blender/render/intern/source/rendercore.c