Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender-addons.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonioya <blendergit@gmail.com>2016-10-02 21:19:42 +0300
committerAntonioya <blendergit@gmail.com>2016-10-02 21:19:42 +0300
commit53b5eca6013cce84ae8a82d248ee0242f722faed (patch)
treec4f63748cc42c3297a6fc132d2a91d4fb631a5e9 /archimesh
parent63ec8445d1b320f8e26dd16bfff0798ffd6ee8cb (diff)
Archimesh: Remove unused parameters added in previous fix
Some parameters not used were included by error in previous commit
Diffstat (limited to 'archimesh')
-rw-r--r--archimesh/achm_gltools.py2
-rw-r--r--archimesh/achm_room_maker.py8
2 files changed, 5 insertions, 5 deletions
diff --git a/archimesh/achm_gltools.py b/archimesh/achm_gltools.py
index 89e29542..b2811e50 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 92f3c555..ac385ef9 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