SVN merge r57320-57365 into soc-2013-dingto
authorThomas Dinges <blender@dingto.org>
Mon, 10 Jun 2013 21:16:29 +0000 (21:16 +0000)
committerThomas Dinges <blender@dingto.org>
Mon, 10 Jun 2013 21:16:29 +0000 (21:16 +0000)
commitcae7c6da533a0f33c1e6ca0b278f5be285320eab
tree0f28690b2ee2c8bf7dc27420d9d820a94be60113
parentad2509b20d95ccdce83fd17a63bf0e6af06e0ce4
parentc03e638cf310cde57ede10d3d9c90aecce007b15
SVN merge r57320-57365 into soc-2013-dingto
intern/cycles/blender/blender_shader.cpp