[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39334] branches/soc-2011-tomato/release/ scripts/startup: Camera tracking integration

Sergey Sharybin g.ulairi at gmail.com
Fri Aug 12 16:41:32 CEST 2011


Revision: 39334
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39334
Author:   nazgul
Date:     2011-08-12 14:41:31 +0000 (Fri, 12 Aug 2011)
Log Message:
-----------
Camera tracking integration
===========================

import common classes from bpy.types

Modified Paths:
--------------
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/presets.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_camera.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_scene.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py

Modified: branches/soc-2011-tomato/release/scripts/startup/bl_operators/presets.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_operators/presets.py	2011-08-12 14:39:04 UTC (rev 39333)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_operators/presets.py	2011-08-12 14:41:31 UTC (rev 39334)
@@ -195,7 +195,7 @@
     preset_subdir = "render"
 
 
-class AddPresetCamera(AddPresetBase, bpy.types.Operator):
+class AddPresetCamera(AddPresetBase, Operator):
     '''Add a Camera Preset'''
     bl_idname = "camera.preset_add"
     bl_label = "Add Camera Preset"
@@ -317,7 +317,7 @@
     preset_subdir = "interaction"
 
 
-class AddPresetTrackingCamera(AddPresetBase, bpy.types.Operator):
+class AddPresetTrackingCamera(AddPresetBase, Operator):
     '''Add a Tracking Camera Intrinsics  Preset'''
     bl_idname = "clip.camera_preset_add"
     bl_label = "Add Camera Preset"
@@ -340,7 +340,7 @@
     preset_subdir = "tracking_camera"
 
 
-class AddPresetTrackingTrackColor(AddPresetBase, bpy.types.Operator):
+class AddPresetTrackingTrackColor(AddPresetBase, Operator):
     '''Add a Clip Track Color Preset'''
     bl_idname = "clip.track_color_preset_add"
     bl_label = "Add Track Color Preset"

Modified: branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_camera.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_camera.py	2011-08-12 14:39:04 UTC (rev 39333)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_camera.py	2011-08-12 14:41:31 UTC (rev 39334)
@@ -62,7 +62,7 @@
             split.separator()
 
 
-class DATA_PT_lens(CameraButtonsPanel, bpy.types.Panel):
+class DATA_PT_lens(CameraButtonsPanel, Panel):
     bl_label = "Lens"
     COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
 

Modified: branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_scene.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_scene.py	2011-08-12 14:39:04 UTC (rev 39333)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_scene.py	2011-08-12 14:41:31 UTC (rev 39334)
@@ -191,7 +191,7 @@
         col.prop(rd, "simplify_ao_sss", text="AO and SSS")
 
 
-class SCENE_PT_movie_clip(SceneButtonsPanel, bpy.types.Panel):
+class SCENE_PT_movie_clip(SceneButtonsPanel, Panel):
     bl_label = "Movie Clip"
 
     def draw(self, context):

Modified: branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py	2011-08-12 14:39:04 UTC (rev 39333)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py	2011-08-12 14:41:31 UTC (rev 39334)
@@ -18,9 +18,10 @@
 
 # <pep8 compliant>
 import bpy
+from bpy.types import Operator, Panel, Header, Menu
 
 
-class CLIP_OT_apply_follow_track(bpy.types.Operator):
+class CLIP_OT_apply_follow_track(Operator):
     bl_idname = "clip.apply_follow_track"
     bl_label = "Apply Follow Track"
     bl_options = {'UNDO', 'REGISTER'}
@@ -57,7 +58,7 @@
         return {'FINISHED'}
 
 
-class CLIP_OT_bundles_to_mesh(bpy.types.Operator):
+class CLIP_OT_bundles_to_mesh(Operator):
     bl_idname = "clip.bundles_to_mesh"
     bl_label = "Bundles to Mesh"
     bl_options = {'UNDO', 'REGISTER'}
@@ -89,7 +90,7 @@
         return {'FINISHED'}
 
 
-class CLIP_HT_header(bpy.types.Header):
+class CLIP_HT_header(Header):
     bl_space_type = 'CLIP_EDITOR'
 
     def draw(self, context):
@@ -120,7 +121,7 @@
                 layout.label(text="Average solve error: %.4f"  % (r.average_error))
 
 
-class CLIP_PT_tools(bpy.types.Panel):
+class CLIP_PT_tools(Panel):
     bl_space_type = 'CLIP_EDITOR'
     bl_region_type = 'TOOLS'
     bl_label = "Tools"
@@ -200,7 +201,7 @@
             layout.operator('clip.open')
 
 
-class CLIP_PT_track(bpy.types.Panel):
+class CLIP_PT_track(Panel):
     bl_space_type = 'CLIP_EDITOR'
     bl_region_type = 'UI'
     bl_label = "Track"
@@ -247,7 +248,7 @@
             layout.label(text=label_text)
 
 
-class CLIP_PT_track_settings(bpy.types.Panel):
+class CLIP_PT_track_settings(Panel):
     bl_space_type = 'CLIP_EDITOR'
     bl_region_type = 'UI'
     bl_label = "Tracking Settings"
@@ -273,7 +274,7 @@
         row.prop(settings, "frames_limit")
 
 
-class CLIP_PT_tracking_camera(bpy.types.Panel):
+class CLIP_PT_tracking_camera(Panel):
     bl_space_type = 'CLIP_EDITOR'
     bl_region_type = 'UI'
     bl_label = "Camera Data"
@@ -321,7 +322,7 @@
         col.prop(clip.tracking.camera, "k3")
 
 
-class CLIP_PT_display(bpy.types.Panel):
+class CLIP_PT_display(Panel):
     bl_space_type = 'CLIP_EDITOR'
     bl_region_type = 'UI'
     bl_label = "Display"
@@ -363,7 +364,7 @@
             layout.prop(clip, "display_aspect", text="")
 
 
-class CLIP_PT_stabilization(bpy.types.Panel):
+class CLIP_PT_stabilization(Panel):
     bl_space_type = 'CLIP_EDITOR'
     bl_region_type = 'UI'
     bl_label = "2D Stabilization"
@@ -407,7 +408,7 @@
         row.prop(stab, "influence_scale")
 
 
-class CLIP_PT_proxy(bpy.types.Panel):
+class CLIP_PT_proxy(Panel):
     bl_space_type = 'CLIP_EDITOR'
     bl_region_type = 'UI'
     bl_label = "Proxy / Timecode"
@@ -456,7 +457,7 @@
         col.prop(clip, "proxy_render_size", text="")
 
 
-class CLIP_PT_footage(bpy.types.Panel):
+class CLIP_PT_footage(Panel):
     bl_space_type = 'CLIP_EDITOR'
     bl_region_type = 'UI'
     bl_label = "Footage Settings"
@@ -480,7 +481,7 @@
             layout.operator("clip.open", icon='FILESEL')
 
 
-class CLIP_MT_view(bpy.types.Menu):
+class CLIP_MT_view(Menu):
     bl_label = "View"
 
     def draw(self, context):
@@ -510,7 +511,7 @@
         layout.operator("screen.screen_full_area")
 
 
-class CLIP_MT_clip(bpy.types.Menu):
+class CLIP_MT_clip(Menu):
     bl_label = "Clip"
 
     def draw(self, context):
@@ -525,7 +526,7 @@
         layout.operator("clip.open")
 
 
-class CLIP_MT_track(bpy.types.Menu):
+class CLIP_MT_track(Menu):
     bl_label = "Track"
 
     def draw(self, context):
@@ -575,7 +576,7 @@
         layout.menu("CLIP_MT_track_transform")
 
 
-class CLIP_MT_track_visibility(bpy.types.Menu):
+class CLIP_MT_track_visibility(Menu):
     bl_label = "Show/Hide"
 
     def draw(self, context):
@@ -588,7 +589,7 @@
         op.unselected = True
 
 
-class CLIP_MT_track_transform(bpy.types.Menu):
+class CLIP_MT_track_transform(Menu):
     bl_label = "Transform"
 
     def draw(self, context):
@@ -598,7 +599,7 @@
         layout.operator("transform.resize")
 
 
-class CLIP_MT_select(bpy.types.Menu):
+class CLIP_MT_select(Menu):
     bl_label = "Select"
 
     def draw(self, context):
@@ -613,7 +614,7 @@
         layout.operator("clip.select_all", text="Inverse").action = 'INVERT'
 
 
-class CLIP_MT_select_grouped(bpy.types.Menu):
+class CLIP_MT_select_grouped(Menu):
     bl_label = "Select Grouped"
 
     def draw(self, context):
@@ -643,7 +644,7 @@
         op.group = 'COLOR'
 
 
-class CLIP_MT_tracking_specials(bpy.types.Menu):
+class CLIP_MT_tracking_specials(Menu):
     bl_label = "Specials"
 
     @classmethod
@@ -674,21 +675,21 @@
         op.action = 'UNLOCK'
 
 
-class CLIP_MT_camera_presets(bpy.types.Menu):
+class CLIP_MT_camera_presets(Menu):
     bl_label = "Camera Presets"
     preset_subdir = "tracking_camera"
     preset_operator = "script.execute_preset"
     draw = bpy.types.Menu.draw_preset
 
 
-class CLIP_MT_track_color_presets(bpy.types.Menu):
+class CLIP_MT_track_color_presets(Menu):
     bl_label = "Color Presets"
     preset_subdir = "tracking_track_color"
     preset_operator = "script.execute_preset"
     draw = bpy.types.Menu.draw_preset
 
 
-class CLIP_MT_track_color_specials(bpy.types.Menu):
+class CLIP_MT_track_color_specials(Menu):
     bl_label = "Track Color Specials"
 
     def draw(self, context):
@@ -697,7 +698,7 @@
         layout.operator('clip.track_copy_color', icon='COPY_ID')
 
 
-class CLIP_MT_stabilize_2d_specials(bpy.types.Menu):
+class CLIP_MT_stabilize_2d_specials(Menu):
     bl_label = "Track Color Specials"
 
     def draw(self, context):




More information about the Bf-blender-cvs mailing list