svn merge ^/trunk/blender -r48576:48585
authorCampbell Barton <ideasman42@gmail.com>
Wed, 4 Jul 2012 11:53:48 +0000 (11:53 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 4 Jul 2012 11:53:48 +0000 (11:53 +0000)
commitfbc24a61c4f63ae6f1abcd136fdff27b3982bd3f
tree28f5b61523ab5d1cfa02e0ecb452b2aa84327866
parente34f28f81ca586db9fc79e4e4f11c506e845f933
parent16e6b7b867778fb041dd7cbe10cb83e8b3de0920
svn merge ^/trunk/blender -r48576:48585
release/scripts/startup/bl_ui/space_node.py
source/blender/compositor/intern/COM_Converter.cpp
source/blender/editors/space_node/node_draw.c
source/blender/makesdna/DNA_node_types.h
source/blender/makesdna/DNA_space_types.h
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_space.c