svn merge ^/trunk/blender -r49177:49186
authorCampbell Barton <ideasman42@gmail.com>
Tue, 24 Jul 2012 21:11:22 +0000 (21:11 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 24 Jul 2012 21:11:22 +0000 (21:11 +0000)
commit65f94b8c0b264187a3fb2c129ae662a7e2d26ad6
tree4d2b2b2c40c16ffe14e7a35d510ebb31432ccdcb
parent375882f396920777eed6532c22b9914e74ee2563
parent99947eb7440bded05d6f1b287836a5f84a330205
svn merge ^/trunk/blender -r49177:49186
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_clip/space_clip.c
source/blender/editors/space_image/space_image.c
source/blender/editors/space_sequencer/sequencer_draw.c
source/blender/makesdna/DNA_space_types.h
source/blender/makesrna/intern/rna_space.c