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)
1  2 
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

Simple merge
Simple merge
Simple merge
Simple merge
index e7177159fae6e18edebabcb49aecd633b843b404,c604d16829ce6a5106e895002102e33bd2a83707..805308cf6629f2517aa45ab14d2676d204bc4a0d
Binary files differ