Merged revision(s) 57671-57767 from trunk/blender into soc-2013-dingto
authorThomas Dinges <blender@dingto.org>
Wed, 26 Jun 2013 11:46:55 +0000 (11:46 +0000)
committerThomas Dinges <blender@dingto.org>
Wed, 26 Jun 2013 11:46:55 +0000 (11:46 +0000)
commit63f1e253c360dcb550bc4b492ccdf0bebf3afa22
tree1dfc762a92efa44b1eb301f970bbf98f7f46827c
parent00234dab2f1a697a33659beee4f4c8856b5ce233
parentd5fd3b36888902367b07d92f7c606a95d603e23b
Merged revision(s) 57671-57767 from trunk/blender into soc-2013-dingto
intern/cycles/blender/addon/ui.py
intern/cycles/render/graph.h
intern/cycles/render/nodes.cpp
intern/cycles/render/nodes.h
release/datafiles/startup.blend
source/blender/blenkernel/intern/node.c