svn merge ^/trunk/blender -r48162:48168
authorCampbell Barton <ideasman42@gmail.com>
Thu, 21 Jun 2012 14:38:45 +0000 (14:38 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 21 Jun 2012 14:38:45 +0000 (14:38 +0000)
commit9653234634b2ddc94efee212017e0381b759ae85
tree0bbadddbf0f821cd16b98cde1f78195ec60de010
parent6d9cd68256c6de19804bd717a5f3bc3c367398dd
parent5def0b6c55d13b07bd59863174379110395e1fed
svn merge ^/trunk/blender -r48162:48168
source/blender/editors/space_node/drawnode.c