[Bf-extensions-cvs] [9f4c9cfa] master: arhcipack: bugfix polyline not rendering, manipulator and wall handling undo

[Stephen Leger]

Commit: 9f4c9cfa52f102637a0dd462d989641a83fca006
Author: Stephen Leger
Date:   Sun May 14 14:33:44 2017 +0200
Branches: master
https://developer.blender.org/rBAC9f4c9cfa52f102637a0dd462d989641a83fca006

arhcipack: bugfix polyline not rendering, manipulator and wall handling undo

===================================================================

M	archipack/archipack_manipulator.py
M	archipack/archipack_wall2.py

===================================================================

diff --git a/archipack/archipack_manipulator.py b/archipack/archipack_manipulator.py
index e6379f84..010c2925 100644
--- a/archipack/archipack_manipulator.py
+++ b/archipack/archipack_manipulator.py
@@ -150,7 +150,7 @@ class Gl():
         gl_type = type(self).__name__
         if 'Handle' in gl_type or gl_type in ['GlPolygon']:
             self._start_poly()
-        elif 'Line' in gl_type or gl_type in ['GlArc']:
+        elif 'Line' in gl_type or gl_type in ['GlArc', 'GlPolyline']:
             self._start_line()
         if 'Text' in gl_type:
             x, y = self.position_2d_from_coord(context, self.pts[0])
@@ -2100,6 +2100,10 @@ class Manipulable():
 
         context.area.tag_redraw()
 
+        if event.type in {'Z'} and event.ctrl and event.value == 'RELEASE':
+            self.manipulable_disable(context)
+            return {'FINISHED'}
+
         # clean up manipulator on delete
         if event.type in {'X'}:
             # @TODO:
diff --git a/archipack/archipack_wall2.py b/archipack/archipack_wall2.py
index 143a644c..e48b11c7 100644
--- a/archipack/archipack_wall2.py
+++ b/archipack/archipack_wall2.py
@@ -556,7 +556,7 @@ class archipack_wall2(Manipulable, PropertyGroup):
                 look at fence implementation for this part
         """
         raise NotImplementedError
-        
+
         for i, line in enumerate(lines):
             if type(line).__name__ == 'Line':
                 self.parts[i].a0 = line.angle
@@ -762,7 +762,7 @@ class archipack_wall2(Manipulable, PropertyGroup):
         for child in relocate:
             name, wall_idx, pos, flip = child
             self.add_child(name, wall_idx, pos, flip)
-            
+
         # add a dumb size from last child to end of wall segment
         for i in range(sum(wall_with_childs)):
             m = self.childs_manipulators.add()
@@ -888,7 +888,7 @@ class archipack_wall2(Manipulable, PropertyGroup):
             if not self.realtime:
                 self.update_childs(context, o, g)
             # trigger wall's update by hand as those manipulations
-            # dosen't affect wall data 
+            # dosen't affect wall data
             # NOTE: update manipulators should be sufficient here
             self.update(context)
 
@@ -920,16 +920,16 @@ class archipack_wall2(Manipulable, PropertyGroup):
 
             # snap point
             self.manip_stack.append(part.manipulators[2].setup(context, o, self))
-            
-            # height as per segment will be here when done 
-            
+
+            # height as per segment will be here when done
+
         # TODO:
         # add last segment snap manipulator at end of the segment
-        
+
         # width + counter
         for m in self.manipulators:
             self.manip_stack.append(m.setup(context, o, self))
-        
+
         # dumb between childs
         for m in self.childs_manipulators:
             self.manip_stack.append(m.setup(context, o, self))
@@ -1087,7 +1087,7 @@ class ARCHIPACK_OT_wall2(Operator):
     bl_options = {'REGISTER', 'UNDO'}
 
     auto_manipulate = BoolProperty(default=True)
-    
+
     def draw(self, context):
         layout = self.layout
         row = layout.row()
@@ -1268,17 +1268,18 @@ class ARCHIPACK_OT_wall2_draw(Operator):
 
                 snap_point(takeloc, self.sp_draw, self.sp_callback, constraint_axis=(True, True, False))
             return {'RUNNING_MODAL'}
-            
-        if event.type in {'BACK_SPACE'} and event.value == 'RELEASE':
+
+        if ((event.type in {'Z'} and event.ctrl and event.value == 'RELEASE') or
+                (event.type in {'BACK_SPACE'} and event.value == 'RELEASE')):
             if self.o is not None:
-                o = self.o                
+                o = self.o
                 o.select = True
                 context.scene.objects.active = o
                 d = o.data.archipack_wall2[0]
                 if d.n_parts > 1:
                     d.n_parts -= 1
-                
-            
+            return {'RUNNING_MODAL'}
+
         if self.state == 'CANCEL' or (event.type in {'ESC', 'RIGHTMOUSE'} and
                 event.value == 'RELEASE'):