svn merge ^/trunk/blender -r48409:48411
authorCampbell Barton <ideasman42@gmail.com>
Fri, 29 Jun 2012 14:39:38 +0000 (14:39 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 29 Jun 2012 14:39:38 +0000 (14:39 +0000)
commit5bdf98b399039c11a332cae514af2d7da2fb19c7
treef9fa6abfe3af664b6de6db1b6b4abe6ea32ec037
parent3ae2d5aa83bb112b52deef039a4823cea3ea552f
parent83093d677049f6ba085c34d1719906e2ee3cc3d1
svn merge ^/trunk/blender -r48409:48411
source/blender/editors/space_node/drawnode.c