Merging r50192 through r50223 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Sun, 26 Aug 2012 14:12:09 +0000 (14:12 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sun, 26 Aug 2012 14:12:09 +0000 (14:12 +0000)
1  2 
source/blender/blenkernel/intern/node.c
source/blender/blenkernel/intern/sequencer.c
source/blender/editors/render/render_internal.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/imbuf/IMB_imbuf.h
source/blender/makesrna/intern/rna_scene.c
source/blenderplayer/bad_level_call_stubs/stubs.c

Simple merge