svn merge ^/trunk/blender -r49244:49250
authorCampbell Barton <ideasman42@gmail.com>
Thu, 26 Jul 2012 13:30:37 +0000 (13:30 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 26 Jul 2012 13:30:37 +0000 (13:30 +0000)
1  2 
SConstruct
build_files/scons/config/darwin-config.py
intern/cycles/kernel/svm/svm_types.h
intern/cycles/render/nodes.cpp
source/blender/compositor/operations/COM_MaskOperation.cpp
source/blender/editors/include/ED_clip.h
source/blender/editors/space_clip/clip_editor.c
source/blender/editors/space_node/drawnode.c
source/blender/makesdna/DNA_node_types.h
source/blender/makesrna/intern/rna_nodetree.c

diff --cc SConstruct
Simple merge
Simple merge
Simple merge