[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43837] trunk/blender: * fix for error in shape transfer (wrong var name).

Campbell Barton ideasman42 at gmail.com
Thu Feb 2 06:11:53 CET 2012


Revision: 43837
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43837
Author:   campbellbarton
Date:     2012-02-02 05:11:42 +0000 (Thu, 02 Feb 2012)
Log Message:
-----------
* 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.

Modified Paths:
--------------
    trunk/blender/release/scripts/modules/bpy_extras/object_utils.py
    trunk/blender/release/scripts/startup/bl_operators/object.py
    trunk/blender/source/tests/bl_run_operators.py

Modified: trunk/blender/release/scripts/modules/bpy_extras/object_utils.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy_extras/object_utils.py	2012-02-02 04:59:30 UTC (rev 43836)
+++ trunk/blender/release/scripts/modules/bpy_extras/object_utils.py	2012-02-02 05:11:42 UTC (rev 43837)
@@ -44,7 +44,7 @@
     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

Modified: trunk/blender/release/scripts/startup/bl_operators/object.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/object.py	2012-02-02 04:59:30 UTC (rev 43836)
+++ trunk/blender/release/scripts/startup/bl_operators/object.py	2012-02-02 05:11:42 UTC (rev 43837)
@@ -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 @@
             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 @@
 
     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:

Modified: trunk/blender/source/tests/bl_run_operators.py
===================================================================
--- trunk/blender/source/tests/bl_run_operators.py	2012-02-02 04:59:30 UTC (rev 43836)
+++ trunk/blender/source/tests/bl_run_operators.py	2012-02-02 05:11:42 UTC (rev 43837)
@@ -37,6 +37,7 @@
     "render.render",
     "*.*_export",
     "*.*_import",
+    "wm.blenderplayer_start",
     "wm.url_open",
     "wm.doc_view",
     "wm.path_open",




More information about the Bf-blender-cvs mailing list