[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43016] trunk/blender/release/scripts/ startup/bl_ui/space_clip.py: minor style edits to space_clip & unused var

Campbell Barton ideasman42 at gmail.com
Sat Dec 31 03:40:44 CET 2011


Revision: 43016
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43016
Author:   campbellbarton
Date:     2011-12-31 02:40:33 +0000 (Sat, 31 Dec 2011)
Log Message:
-----------
minor style edits to space_clip & unused var

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

Modified: trunk/blender/release/scripts/startup/bl_ui/space_clip.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_clip.py	2011-12-30 23:45:48 UTC (rev 43015)
+++ trunk/blender/release/scripts/startup/bl_ui/space_clip.py	2011-12-31 02:40:33 UTC (rev 43016)
@@ -16,7 +16,8 @@
 #
 # ##### END GPL LICENSE BLOCK #####
 
-# <pep8 compliant>
+# <pep8-80 compliant>
+
 import bpy
 from bpy.types import Panel, Header, Menu
 
@@ -209,12 +210,9 @@
 
         col = layout.column(align=True)
 
-        if tracking_object.is_camera:
-            solve_text = "Camera Motion"
-        else:
-            solve_text = "Object Motion"
-
-        col.operator("clip.solve_camera", text=solve_text)
+        col.operator("clip.solve_camera",
+                     text="Camera Motion" if tracking_object.is_camera
+                     else "Object Motion")
         col.operator("clip.clear_solution")
 
         col = layout.column(align=True)
@@ -379,11 +377,12 @@
     def draw(self, context):
         layout = self.layout
         sc = context.space_data
-        clip = context.space_data.clip
+        clip = sc.clip
         tracking = clip.tracking
 
         row = layout.row()
-        row.template_list(tracking, "objects", tracking, "active_object_index", rows=3)
+        row.template_list(tracking, "objects",
+                          tracking, "active_object_index", rows=3)
 
         sub = row.column(align=True)
 
@@ -472,7 +471,7 @@
     def poll(cls, context):
         sc = context.space_data
 
-        return sc.mode in ['TRACKING', 'DISTORTION'] and sc.clip
+        return sc.mode in {'TRACKING', 'DISTORTION'} and sc.clip
 
     def draw(self, context):
         layout = self.layout




More information about the Bf-blender-cvs mailing list