svn merge ^/trunk/blender -r46632:46684

2012-05-16 09:12:18 +00:00
parent e5927b8cc5 9bcf305431
commit d82ca6d636
122 changed files with 1905 additions and 3092 deletions
--- a/release/scripts/startup/bl_ui/space_clip.py
+++ b/release/scripts/startup/bl_ui/space_clip.py
@@ -107,6 +107,7 @@ class CLIP_PT_clip_view_panel:

        return clip and sc.view == 'CLIP'

+
 class CLIP_PT_tracking_panel:

    @classmethod