svn merge ^/trunk/blender -r49263:49280
authorCampbell Barton <ideasman42@gmail.com>
Fri, 27 Jul 2012 10:27:28 +0000 (10:27 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 27 Jul 2012 10:27:28 +0000 (10:27 +0000)
commitfc0bf221861a2acab5fc602d09db135dcd595504
tree0e81bfa738489b9222f360f72e2feb797ad09054
parentf6b542aeb21c730e68de8ea8fb5ae2d50868cd30
parentb8d96bc011d255fa06c1327999c199c417c89225
svn merge ^/trunk/blender -r49263:49280
16 files changed:
source/blender/blenkernel/BKE_mask.h
source/blender/blenkernel/intern/mask.c
source/blender/blenloader/intern/readfile.c
source/blender/compositor/operations/COM_MaskOperation.cpp
source/blender/editors/include/ED_clip.h
source/blender/editors/interface/interface_templates.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/space_image.c
source/blender/editors/space_node/drawnode.c
source/blender/editors/space_node/space_node.c
source/blender/editors/space_sequencer/sequencer_draw.c
source/blender/makesdna/DNA_node_types.h
source/blender/makesrna/intern/rna_nodetree.c