Blender Git Loki

Revision f4a9215 by Brecht Van Lommel (master)

September 17, 2011, 13:28 (GMT)

Cycles: svn merge -r39870:r40266 https://svn.blender.org/svnroot/bf-blender/trunk/blender

Merging the node changes required a lot of conflict resolution, fixed the
issues I could find but if you want stability you might want to wait a bit
before updating.

Full Hash: f4a9215d7c80da4d39bd195c334fcb26676b12d5
SVN Revision: 40298
Parent Commits: 66b1dfa, d87fcb0