[Bf-blender-cvs] [89b6c72] master: Cleanup: python
Campbell Barton
noreply at git.blender.org
Tue May 26 15:54:36 CEST 2015
Commit: 89b6c72f8d12f6a3e3671e8908f608430de65e22
Author: Campbell Barton
Date: Tue May 26 23:53:47 2015 +1000
Branches: master
https://developer.blender.org/rB89b6c72f8d12f6a3e3671e8908f608430de65e22
Cleanup: python
===================================================================
M release/scripts/startup/bl_operators/anim.py
M release/scripts/startup/bl_operators/mask.py
M release/scripts/startup/bl_ui/space_clip.py
===================================================================
diff --git a/release/scripts/startup/bl_operators/anim.py b/release/scripts/startup/bl_operators/anim.py
index ed7423f..f3575f2 100644
--- a/release/scripts/startup/bl_operators/anim.py
+++ b/release/scripts/startup/bl_operators/anim.py
@@ -232,7 +232,7 @@ class BakeAction(Operator):
action = None
if self.use_current_action:
- obj = bpy.context.object
+ obj = context.object
if obj.animation_data:
action = obj.animation_data.action
diff --git a/release/scripts/startup/bl_operators/mask.py b/release/scripts/startup/bl_operators/mask.py
index 60208d2..aa98465 100644
--- a/release/scripts/startup/bl_operators/mask.py
+++ b/release/scripts/startup/bl_operators/mask.py
@@ -18,7 +18,6 @@
# <pep8-80 compliant>
-import bpy
from bpy.types import Menu
diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py
index ecfab47..33943af 100644
--- a/release/scripts/startup/bl_ui/space_clip.py
+++ b/release/scripts/startup/bl_ui/space_clip.py
@@ -988,7 +988,7 @@ class CLIP_PT_proxy(CLIP_PT_clip_view_panel, Panel):
col.prop(clip.proxy, "directory")
col.operator("clip.rebuild_proxy",
- text="Build Proxy / Timecode" if clip.source == 'MOVIE' \
+ text="Build Proxy / Timecode" if clip.source == 'MOVIE'
else "Build Proxy")
if clip.source == 'MOVIE':
More information about the Bf-blender-cvs
mailing list