Merging r49413 through r49450 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 1 Aug 2012 14:14:22 +0000 (14:14 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 1 Aug 2012 14:14:22 +0000 (14:14 +0000)
commit3f5e3ae0bf1552021121ff7844432bb5ff15358c
treea91b5b427ae11fcc2d27250b3b6cad6490743073
parentaec620cc28d2f0901a49af2b7a6081cef5765443
parent8a1a4a453dd3cca0319ca88dbab271089d178c20
Merging r49413 through r49450 from trunk into soc-2011-tomato
19 files changed:
release/scripts/startup/bl_ui/space_image.py
release/scripts/startup/bl_ui/space_node.py
source/blender/blenkernel/BKE_node.h
source/blender/blenkernel/intern/mask.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_clip/clip_draw.c
source/blender/editors/space_clip/clip_editor.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/makesdna/DNA_node_types.h
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_space.c
source/blender/render/extern/include/RE_pipeline.h
source/blender/render/intern/source/pipeline.c
source/blender/windowmanager/intern/wm_init_exit.c
source/blenderplayer/bad_level_call_stubs/stubs.c