svn merge ^/trunk/blender -r46684:46699
authorCampbell Barton <ideasman42@gmail.com>
Wed, 16 May 2012 16:41:51 +0000 (16:41 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 16 May 2012 16:41:51 +0000 (16:41 +0000)
commit09bb37fe932d810b60054a0dd47492679479cef2
treed432ed442396fc6613135a0f55d48fe3a6ee790b
parentd82ca6d636bfee0ebaa308a98c07b03e7de979eb
parentbd45c0008ce7674a05f910c4c80c2f4fa44e9b5d
svn merge ^/trunk/blender -r46684:46699
source/blender/blenkernel/intern/mask.c
source/blender/editors/include/ED_transform.h
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_conversions.c
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/rna_nodetree.c
source/blender/nodes/composite/node_composite_tree.c