[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37616] trunk/blender/release/scripts/ modules: fix for error caused with module relocation - broke loading ngons in OBJ files

Campbell Barton ideasman42 at gmail.com
Sat Jun 18 13:40:45 CEST 2011


Revision: 37616
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37616
Author:   campbellbarton
Date:     2011-06-18 11:40:44 +0000 (Sat, 18 Jun 2011)
Log Message:
-----------
fix for error caused with module relocation - broke loading ngons in OBJ files

Modified Paths:
--------------
    trunk/blender/release/scripts/modules/bpy_extras/mesh_utils.py
    trunk/blender/release/scripts/modules/bpy_types.py

Modified: trunk/blender/release/scripts/modules/bpy_extras/mesh_utils.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy_extras/mesh_utils.py	2011-06-18 09:01:26 UTC (rev 37615)
+++ trunk/blender/release/scripts/modules/bpy_extras/mesh_utils.py	2011-06-18 11:40:44 UTC (rev 37616)
@@ -267,6 +267,7 @@
     fix_loops: If this is enabled polylines that use loops to make multiple polylines are delt with correctly.
     '''
 
+    from mathutils.geometry import tesselate_polygon
     from mathutils import Vector
     vector_to_tuple = Vector.to_tuple
 

Modified: trunk/blender/release/scripts/modules/bpy_types.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy_types.py	2011-06-18 09:01:26 UTC (rev 37615)
+++ trunk/blender/release/scripts/modules/bpy_types.py	2011-06-18 11:40:44 UTC (rev 37616)
@@ -20,7 +20,6 @@
 
 from _bpy import types as bpy_types
 import _bpy
-from mathutils import Vector
 
 StructRNA = bpy_types.Struct.__bases__[0]
 StructMetaPropGroup = _bpy.StructMetaPropGroup
@@ -144,18 +143,21 @@
     def x_axis(self):
         """ Vector pointing down the x-axis of the bone.
         """
+        from mathutils import Vector
         return Vector((1.0, 0.0, 0.0)) * self.matrix.to_3x3()
 
     @property
     def y_axis(self):
         """ Vector pointing down the x-axis of the bone.
         """
+        from mathutils import Vector
         return Vector((0.0, 1.0, 0.0)) * self.matrix.to_3x3()
 
     @property
     def z_axis(self):
         """ Vector pointing down the x-axis of the bone.
         """
+        from mathutils import Vector
         return Vector((0.0, 0.0, 1.0)) * self.matrix.to_3x3()
 
     @property




More information about the Bf-blender-cvs mailing list