[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [4107] trunk/py/scripts/addons/ mesh_looptools.py: svn merge . -r4105:4104

[Campbell Barton]

Revision: 4107
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=4107
Author:   campbellbarton
Date:     2012-12-27 10:56:18 +0000 (Thu, 27 Dec 2012)
Log Message:
-----------
svn merge . -r4105:4104

add back bevel tool menu, it no longer crashes.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=4105

Modified Paths:
--------------
    trunk/py/scripts/addons/mesh_looptools.py

Modified: trunk/py/scripts/addons/mesh_looptools.py
===================================================================
--- trunk/py/scripts/addons/mesh_looptools.py	2012-12-27 07:30:18 UTC (rev 4106)
+++ trunk/py/scripts/addons/mesh_looptools.py	2012-12-27 10:56:18 UTC (rev 4107)
@@ -3619,12 +3619,12 @@
     def draw(self, context):
         layout = self.layout
         
-#        layout.operator("mesh.looptools_bridge", text="Bridge").loft = False
+        layout.operator("mesh.looptools_bridge", text="Bridge").loft = False
         layout.operator("mesh.looptools_circle")
         layout.operator("mesh.looptools_curve")
         layout.operator("mesh.looptools_flatten")
         layout.operator("mesh.looptools_gstretch")
-#        layout.operator("mesh.looptools_bridge", text="Loft").loft = True
+        layout.operator("mesh.looptools_bridge", text="Loft").loft = True
         layout.operator("mesh.looptools_relax")
         layout.operator("mesh.looptools_space")
 
@@ -3648,7 +3648,7 @@
             split.prop(lt, "display_bridge", text="", icon='DOWNARROW_HLT')
         else:
             split.prop(lt, "display_bridge", text="", icon='RIGHTARROW')
-#        split.operator("mesh.looptools_bridge", text="Bridge").loft = False
+        split.operator("mesh.looptools_bridge", text="Bridge").loft = False
         # bridge - settings
         if lt.display_bridge:
             box = col.column(align=True).box().column()
@@ -3757,7 +3757,7 @@
             split.prop(lt, "display_loft", text="", icon='DOWNARROW_HLT')
         else:
             split.prop(lt, "display_loft", text="", icon='RIGHTARROW')
-#        split.operator("mesh.looptools_bridge", text="Loft").loft = True
+        split.operator("mesh.looptools_bridge", text="Loft").loft = True
         # loft - settings
         if lt.display_loft:
             box = col.column(align=True).box().column()