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)
commitd82ca6d636bfee0ebaa308a98c07b03e7de979eb
tree5baa0f9e0a1bf2c9cd16bf19f25b3f62f7093657
parente5927b8cc5bb9a5e06008ab29d04d70db70316e8
parent9bcf305431cebaafb775a5ec61dd70df9008adeb
svn merge ^/trunk/blender -r46632:46684
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