diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-02 09:11:42 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-02 09:11:42 +0400 |
| commit | d8c4e59f673cae8a2090a2821730fc01d1287518 (patch) | |
| tree | 8548784da498d2ba23fb89fbafc238bcd49a75f7 | |
| parent | 369ae3d28d54cf2723ca8eddf1a76a7737b3fbe1 (diff) | |
* fix for error in shape transfer (wrong var name).
* fix for error alligning object to the view when no space was set.
also added blenderplayer start to CTest operator blacklist.
| -rw-r--r-- | release/scripts/modules/bpy_extras/object_utils.py | 2 | ||||
| -rw-r--r-- | release/scripts/startup/bl_operators/object.py | 9 | ||||
| -rw-r--r-- | source/tests/bl_run_operators.py | 1 |
3 files changed, 8 insertions, 4 deletions
diff --git a/release/scripts/modules/bpy_extras/object_utils.py b/release/scripts/modules/bpy_extras/object_utils.py index c9c1dc05476..66b774e6301 100644 --- a/release/scripts/modules/bpy_extras/object_utils.py +++ b/release/scripts/modules/bpy_extras/object_utils.py @@ -44,7 +44,7 @@ def add_object_align_init(context, operator): properties = operator.properties if operator is not None else None space_data = context.space_data - if space_data.type != 'VIEW_3D': + if space_data and space_data.type != 'VIEW_3D': space_data = None # location diff --git a/release/scripts/startup/bl_operators/object.py b/release/scripts/startup/bl_operators/object.py index 2c329de3644..923a259c69c 100644 --- a/release/scripts/startup/bl_operators/object.py +++ b/release/scripts/startup/bl_operators/object.py @@ -20,7 +20,10 @@ import bpy from bpy.types import Operator -from bpy.props import StringProperty, BoolProperty, EnumProperty, IntProperty +from bpy.props import (StringProperty, + BoolProperty, + EnumProperty, + IntProperty) class SelectPattern(Operator): @@ -54,7 +57,7 @@ class SelectPattern(Operator): pattern_match = fnmatch.fnmatchcase else: pattern_match = (lambda a, b: - fnmatch.fnmatchcase(a.upper(), b.upper())) + fnmatch.fnmatchcase(a.upper(), b.upper())) is_ebone = False obj = context.object if obj and obj.mode == 'POSE': @@ -490,7 +493,7 @@ class ShapeTransfer(Operator): def execute(self, context): ob_act = context.active_object - objects = [ob for ob in C.selected_editable_objects if ob != ob_act] + objects = [ob for ob in context.selected_editable_objects if ob != ob_act] if 1: # swap from/to, means we cant copy to many at once. if len(objects) != 1: diff --git a/source/tests/bl_run_operators.py b/source/tests/bl_run_operators.py index 476ccc30b54..b3781e94696 100644 --- a/source/tests/bl_run_operators.py +++ b/source/tests/bl_run_operators.py @@ -37,6 +37,7 @@ op_blacklist = ( "render.render", "*.*_export", "*.*_import", + "wm.blenderplayer_start", "wm.url_open", "wm.doc_view", "wm.path_open", |