svn merge ^/trunk/blender -r48153:48158
authorCampbell Barton <ideasman42@gmail.com>
Thu, 21 Jun 2012 12:29:48 +0000 (12:29 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 21 Jun 2012 12:29:48 +0000 (12:29 +0000)
commit86f9f3e439b10007a844aba931276a870355f909
tree6208ced17301a0b55ec67e824a123f21d5df0a53
parent78b2f5df4743b52319e211e77d6ce1b0cd049afa
parent54156e2b824c9e5a4293060b194630630d1f9dc7
svn merge ^/trunk/blender -r48153:48158
SConstruct
source/blender/compositor/nodes/COM_MaskNode.cpp
source/blender/editors/space_node/drawnode.c
source/blender/makesdna/DNA_node_types.h
source/blender/makesrna/intern/rna_nodetree.c
source/blender/nodes/composite/nodes/node_composite_mask.c