svn merge ^/trunk/blender -r47423:47506
authorCampbell Barton <ideasman42@gmail.com>
Wed, 6 Jun 2012 10:25:59 +0000 (10:25 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 6 Jun 2012 10:25:59 +0000 (10:25 +0000)
commit870ba8aa13c87fdeb1724d0f3ad7b7a4b53a4d32
treeb20f227ec19530eab04c9a54e8cf7faaf16f634d
parent2202aaa083b99a4c37c20fbaf34e370d4e78c839
parent8849a789702a9be0c06ecc850845c3bb3af0d0fd
svn merge ^/trunk/blender -r47423:47506
15 files changed:
release/scripts/startup/bl_ui/space_clip.py
source/blender/blenkernel/intern/movieclip.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_clip/clip_buttons.c
source/blender/editors/space_clip/clip_draw.c
source/blender/editors/space_clip/space_clip.c
source/blender/editors/space_node/drawnode.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_ops.c
source/blender/makesdna/DNA_node_types.h
source/blender/makesdna/DNA_space_types.h
source/blender/makesrna/intern/rna_movieclip.c
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_space.c