Merging r50049 through r50076 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 21 Aug 2012 10:44:04 +0000 (10:44 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 21 Aug 2012 10:44:04 +0000 (10:44 +0000)
26 files changed:
1  2 
build_files/scons/tools/btools.py
source/blender/blenkernel/BKE_colortools.h
source/blender/blenkernel/BKE_sequencer.h
source/blender/blenkernel/intern/colortools.c
source/blender/editors/include/ED_clip.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_clip/clip_buttons.c
source/blender/editors/space_clip/clip_draw.c
source/blender/editors/space_clip/clip_editor.c
source/blender/editors/space_clip/space_clip.c
source/blender/editors/space_image/image_buttons.c
source/blender/editors/space_image/image_draw.c
source/blender/editors/space_image/image_ops.c
source/blender/editors/space_image/space_image.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_sequencer/sequencer_edit.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/makesdna/DNA_color_types.h
source/blender/makesrna/intern/rna_color.c
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/render_result.c
source/blender/windowmanager/intern/wm_init_exit.c
source/blender/windowmanager/intern/wm_window.c

Simple merge