Merge remote-tracking branch 'origin/master'

Conflicts: utils/csg_geom.py
nortikin · Mar 12, 2015 · c7668bd · c7668bd
2 parents 1d87e0a + 9170d5a
commit c7668bd
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/utils/csg_geom.py b/utils/csg_geom.py
@@ -225,8 +225,8 @@ def __init__(self, vertices, shared=None):
         self.vertices = list(vertices)
         self.shared = shared
         self.plane = CSGPlane.fromPoints(
-            self.vertices[0].pos, 
-            self.vertices[1].pos, 
+            self.vertices[0].pos,
+            self.vertices[1].pos,
             self.vertices[2].pos)
 
     def clone(self):
@@ -329,8 +329,6 @@ def allPolygons(self):
 
     def build(self, polygons):
         if isinstance(polygons, map):
-            # if not len(list(polygons)):
-            #     return
             polygons = list(polygons)
             if not len(polygons):
                 return