Merged revision(s) 57499-57586 from trunk/blender into soc-2013-dingto
authorThomas Dinges <blender@dingto.org>
Wed, 19 Jun 2013 20:40:54 +0000 (20:40 +0000)
committerThomas Dinges <blender@dingto.org>
Wed, 19 Jun 2013 20:40:54 +0000 (20:40 +0000)
1  2 
intern/cycles/blender/addon/ui.py
intern/cycles/blender/blender_shader.cpp
intern/cycles/kernel/CMakeLists.txt
intern/cycles/kernel/kernel_shader.h
intern/cycles/kernel/kernel_types.h
intern/cycles/render/shader.cpp
intern/cycles/render/shader.h
intern/cycles/render/svm.cpp

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge