svn merge ^/trunk/blender -r49333:49361
authorCampbell Barton <ideasman42@gmail.com>
Sun, 29 Jul 2012 18:48:34 +0000 (18:48 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 29 Jul 2012 18:48:34 +0000 (18:48 +0000)
commita14fc54702d65031807b5c84ec3fb821780800dd
tree22d72cd71bb8747eddbd23fbc21a80247731563d
parentb6288e94ebb9da8cf6377ede4d0748e861c4d3a1
parent7217927414407f8929a02c610fb06e61c0bff930
svn merge ^/trunk/blender -r49333:49361
18 files changed:
release/scripts/startup/bl_ui/space_clip.py
release/scripts/startup/bl_ui/space_image.py
release/scripts/startup/bl_ui/space_node.py
release/scripts/startup/bl_ui/space_sequencer.py
source/blender/blenkernel/intern/colortools.c
source/blender/blenkernel/intern/node.c
source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
source/blender/compositor/operations/COM_ViewerBaseOperation.h
source/blender/editors/space_clip/clip_draw.c
source/blender/editors/space_clip/clip_editor.c
source/blender/editors/space_image/image_ops.c
source/blender/editors/space_node/drawnode.c
source/blender/editors/space_node/node_draw.c
source/blender/editors/space_sequencer/sequencer_draw.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/imbuf/intern/divers.c
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_scene.c