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)
1  2 
intern/cycles/blender/blender_shader.cpp