svn merge ^/trunk/blender -r48160:48162
authorCampbell Barton <ideasman42@gmail.com>
Thu, 21 Jun 2012 12:46:33 +0000 (12:46 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 21 Jun 2012 12:46:33 +0000 (12:46 +0000)
commit6d9cd68256c6de19804bd717a5f3bc3c367398dd
tree80d40e556d56a5e7c2d4bd7e338a4dba3ca4035c
parent27c10cdf32be3c2b84c7f655712f09ba2a94e501
parenta803ce42df3a9148ce5128f054345f051cd6f57d
svn merge ^/trunk/blender -r48160:48162
source/blender/makesdna/DNA_node_types.h
source/blender/makesrna/intern/rna_nodetree.c