fixed ability to call split_geometry too early

- pressing 'p', 'c', 'y', etc calls split_geometry. I made sure that this did not happen if the user is not at the proper stage
patmo141 · Jun 27, 2018 · 0d39c0f · 0d39c0f
1 parent db32325
commit 0d39c0f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/common_drawing.py b/common_drawing.py
@@ -89,7 +89,7 @@ def draw3d_quads(context, lpoints, color): #, color_mirror):
     #        for coord in points:
     #            bgl.glVertex3f(-coord.x,coord.y,coord.z)
     bgl.glEnd()
-    
+
 def draw3d_points(context, points, color, size):
     bgl.glColor4f(*color)
     bgl.glPointSize(size)

diff --git a/op_polytrim/polytrim_ui_modalwait.py b/op_polytrim/polytrim_ui_modalwait.py
@@ -68,20 +68,23 @@ def modal_wait(self,context,eventd):
                 return 'finish'
 
         if eventd['press'] == 'P':
-            #self.knife.preview_mesh(eventd['context'])
-            self.knife.split_geometry(eventd['context'], mode = 'SEPARATE')
+            if self.knife.split and self.knife.face_seed and len(self.knife.ed_map):
+                self.knife.split_geometry(eventd['context'], mode = 'SEPARATE')
             return 'finish'
 
         if eventd['press'] == 'X':
-            self.knife.split_geometry(eventd['context'], mode = 'DELETE')
+            if self.knife.split and self.knife.face_seed and len(self.knife.ed_map):
+                self.knife.split_geometry(eventd['context'], mode = 'DELETE')
             return 'finish'
 
         if eventd['press'] == 'Y':
-            self.knife.split_geometry(eventd['context'], mode = 'SPLIT')
+            if self.knife.split and self.knife.face_seed and len(self.knife.ed_map):
+                self.knife.split_geometry(eventd['context'], mode = 'SPLIT')
             return 'finish'
 
         if eventd['press'] == 'SHIFT+D':
-            self.knife.split_geometry(eventd['context'], mode = 'DUPLICATE')
+            if self.knife.split and self.knife.face_seed and len(self.knife.ed_map):
+                self.knife.split_geometry(eventd['context'], mode = 'DUPLICATE')
             return 'finish'
 
         if eventd['press'] == 'S':