[Bf-extensions-cvs] [53b5eca] master: Archimesh: Remove unused parameters added in previous fix

[Antonioya]

Commit: 53b5eca6013cce84ae8a82d248ee0242f722faed
Author: Antonioya
Date:   Sun Oct 2 20:19:42 2016 +0200
Branches: master
https://developer.blender.org/rBA53b5eca6013cce84ae8a82d248ee0242f722faed

Archimesh: Remove unused parameters added in previous fix

Some parameters not used were included by error in previous commit

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

M	archimesh/achm_gltools.py
M	archimesh/achm_room_maker.py

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

diff --git a/archimesh/achm_gltools.py b/archimesh/achm_gltools.py
index 89e2954..b2811e5 100644
--- a/archimesh/achm_gltools.py
+++ b/archimesh/achm_gltools.py
@@ -155,7 +155,7 @@ def draw_line(v1, v2):
 # -------------------------------------------------------------
 def draw_room_data(myobj, op, region, rv3d, rgb, rgbw, fsize, wfsize, space, measure, dspname):
 
-    verts, activefaces, activenormals = get_wall_points(myobj, op)
+    verts, activefaces, activenormals = get_wall_points(myobj)
 
     # --------------------------
     # Get line points and draw
diff --git a/archimesh/achm_room_maker.py b/archimesh/achm_room_maker.py
index 92f3c55..ac385ef 100644
--- a/archimesh/achm_room_maker.py
+++ b/archimesh/achm_room_maker.py
@@ -970,7 +970,7 @@ def get_hight(verts, faces_4, faces_3, face_index, face_num):
 # ------------------------------------
 # Sort list of faces
 # ------------------------------------
-def sort_facelist(activefaces, activenormals, merge):
+def sort_facelist(activefaces, activenormals):
     totfaces = len(activefaces)
     newlist = []
     newnormal = []
@@ -1036,7 +1036,7 @@ def sort_facelist(activefaces, activenormals, merge):
 # selobject: room
 # rp: roomproperties
 # ------------------------------------
-def get_wall_points(selobject, rp):
+def get_wall_points(selobject):
     obverts = selobject.data.vertices
     obfaces = selobject.data.polygons
 
@@ -1088,7 +1088,7 @@ def get_wall_points(selobject, rp):
     # ------------------------
     # Sort faces
     # ------------------------
-    newlist, newnormal = sort_facelist(activefaces, activenormals, rp.merge)
+    newlist, newnormal = sort_facelist(activefaces, activenormals)
 
     return verts, newlist, newnormal
 
@@ -1104,7 +1104,7 @@ def add_shell(selobject, objname, rp):
     myvertex = []
     myfaces = []
 
-    verts, activefaces, activenormals = get_wall_points(selobject, rp)
+    verts, activefaces, activenormals = get_wall_points(selobject)
 
     # --------------------------
     # Get line points