[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47672] trunk/blender/release/scripts: Synchronize changes with tomato branch

[Sergey Sharybin]

Revision: 47672
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47672
Author:   nazgul
Date:     2012-06-10 12:30:47 +0000 (Sun, 10 Jun 2012)
Log Message:
-----------
Synchronize changes with tomato branch

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/space_clip.py

Added Paths:
-----------
    trunk/blender/release/scripts/presets/camera/Nikon_D35.py.diff

Added: trunk/blender/release/scripts/presets/camera/Nikon_D35.py.diff
===================================================================
--- trunk/blender/release/scripts/presets/camera/Nikon_D35.py.diff	                        (rev 0)
+++ trunk/blender/release/scripts/presets/camera/Nikon_D35.py.diff	2012-06-10 12:30:47 UTC (rev 47672)
@@ -0,0 +1,7 @@
+--- /dev/null
++++ b/release/scripts/presets/camera/Nikon_D35.py
+@@ -0,0 +1,4 @@
++import bpy
++bpy.context.object.data.sensor_width = 36.0
++bpy.context.object.data.sensor_height = 23.9
++bpy.context.object.data.sensor_fit = 'HORIZONTAL'

Modified: trunk/blender/release/scripts/startup/bl_ui/space_clip.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_clip.py	2012-06-10 12:26:33 UTC (rev 47671)
+++ trunk/blender/release/scripts/startup/bl_ui/space_clip.py	2012-06-10 12:30:47 UTC (rev 47672)
@@ -181,16 +181,6 @@
         return clip and sc.mode == 'RECONSTRUCTION' and sc.view == 'CLIP'
 
 
-class CLIP_PT_distortion_panel:
-
-    @classmethod
-    def poll(cls, context):
-        sc = context.space_data
-        clip = sc.clip
-
-        return clip and sc.mode == 'DISTORTION' and sc.view == 'CLIP'
-
-
 class CLIP_PT_tools_marker(CLIP_PT_tracking_panel, Panel):
     bl_space_type = 'CLIP_EDITOR'
     bl_region_type = 'TOOLS'