svn merge ^/trunk/blender -r48489:48527
authorCampbell Barton <ideasman42@gmail.com>
Tue, 3 Jul 2012 11:03:39 +0000 (11:03 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 3 Jul 2012 11:03:39 +0000 (11:03 +0000)
commit259e78997a50e4be6ed4f2eda7f128c892ad51ca
treeb6291b39353e3c785bb3c5ce0a01122651e7fcbb
parent1c00740b8155ce2c094189df49ad6ea1ac19b33a
parent314a2758505aeba72e2c87f06c5a61c6ceb7773c
svn merge ^/trunk/blender -r48489:48527
release/scripts/startup/bl_operators/screen_play_rendered_anim.py
source/blender/editors/space_node/drawnode.c