svn merge ^/trunk/blender -r47103:47150
authorCampbell Barton <ideasman42@gmail.com>
Tue, 29 May 2012 05:48:07 +0000 (05:48 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 29 May 2012 05:48:07 +0000 (05:48 +0000)
commitb6a28065c945b4470d521308aca52e81f6cc2264
treec74c1e88b5841e83a5d75ce963b57ab381ae2cc0
parent8ab667c17491c16573289471fea3647830b589f5
parentb0de69b48f8836939b807f3671bbeb8cc3bf6899
svn merge ^/trunk/blender -r47103:47150
source/blender/blenloader/intern/readfile.c
source/blender/makesrna/intern/rna_nodetree.c