Merged revision(s) 58356-58423 from trunk/blender into soc-2013-dingto.
authorThomas Dinges <blender@dingto.org>
Sat, 20 Jul 2013 15:34:19 +0000 (15:34 +0000)
committerThomas Dinges <blender@dingto.org>
Sat, 20 Jul 2013 15:34:19 +0000 (15:34 +0000)
commit715855d0b97cc1fa51031aea6393aa89f89b2d65
tree14a41f2598f97305dc2dc1daaef2ec9a5fbf8e8f
parentc04575b9741bdab64848d13bd96ed7ca498830ac
parent3cd53aff090b14cd050c931badf8856e903aad01
Merged revision(s) 58356-58423 from trunk/blender into soc-2013-dingto.

Note: Keep own splash.
intern/cycles/blender/blender_sync.cpp
source/blender/blenkernel/intern/node.c
source/blender/editors/space_node/drawnode.c
source/blender/nodes/NOD_static_types.h