svn merge ^/trunk/blender -r46632:46684
authorCampbell Barton <ideasman42@gmail.com>
Wed, 16 May 2012 09:12:18 +0000 (09:12 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 16 May 2012 09:12:18 +0000 (09:12 +0000)
1  2 
release/scripts/startup/bl_ui/space_clip.py
source/blender/blenkernel/intern/depsgraph.c
source/blender/blenkernel/intern/tracking.c
source/blender/editors/space_clip/clip_editor.c