Merged revision(s) 57423-57498 from trunk/blender into soc-2013-dingto
authorThomas Dinges <blender@dingto.org>
Sun, 16 Jun 2013 12:05:39 +0000 (12:05 +0000)
committerThomas Dinges <blender@dingto.org>
Sun, 16 Jun 2013 12:05:39 +0000 (12:05 +0000)
commit04295954408db25e749a897a7db2972049005688
tree1db66e453f0599289762474e591fd2569ae0591f
parent9e16c5a9e429e0d00801a4dd6ee71a8fbf6691f0
parent29be97975876a1f298f4e6dab14c75aa9956f96a
Merged revision(s) 57423-57498 from trunk/blender into soc-2013-dingto
intern/cycles/kernel/svm/svm.h
source/blender/blenkernel/intern/node.c