svn merge ^/trunk/blender -r48333:48370
authorCampbell Barton <ideasman42@gmail.com>
Thu, 28 Jun 2012 11:20:19 +0000 (11:20 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 28 Jun 2012 11:20:19 +0000 (11:20 +0000)
commit6b345811b7f9d271673cb97597bfbefc42d2327b
tree45d4424165eb5b7ed280f9ef27a6d20132ab1677
parentad79bea8e4a4df7e9a5abb5bc665bd39137b9b30
parent57b69abe0d3263c4f03d453d896ee9527c75d673
svn merge ^/trunk/blender -r48333:48370
CMakeLists.txt
source/blender/compositor/CMakeLists.txt
source/blender/editors/space_node/drawnode.c
source/blender/imbuf/intern/allocimbuf.c
source/blender/makesrna/intern/rna_nodetree.c