Revision: 62850
http://sourceforge.net/p/brlcad/code/62850
Author: brlcad
Date: 2014-09-18 20:57:57 +0000 (Thu, 18 Sep 2014)
Log Message:
-----------
ws
Modified Paths:
--------------
brlcad/trunk/src/conv/stl/stl-g.c
Modified: brlcad/trunk/src/conv/stl/stl-g.c
===================================================================
--- brlcad/trunk/src/conv/stl/stl-g.c 2014-09-18 20:39:13 UTC (rev 62849)
+++ brlcad/trunk/src/conv/stl/stl-g.c 2014-09-18 20:57:57 UTC (rev 62850)
@@ -353,15 +353,12 @@
mk_lrcomb(fd_out, bu_vls_addr(®ion_name), &head, 1, (char *)NULL,
(char *)NULL, color, const_id, 0, mat_code, 100, 0);
if (face_count) {
- (void)mk_addmember(bu_vls_addr(®ion_name), &all_head.l,
- NULL, WMOP_UNION);
+ (void)mk_addmember(bu_vls_addr(®ion_name), &all_head.l, NULL,
WMOP_UNION);
}
} else {
- mk_lrcomb(fd_out, bu_vls_addr(®ion_name), &head, 1, (char *)NULL,
- (char *)NULL, color, id_no, 0, mat_code, 100, 0);
+ mk_lrcomb(fd_out, bu_vls_addr(®ion_name), &head, 1, (char *)NULL,
(char *)NULL, color, id_no, 0, mat_code, 100, 0);
if (face_count)
- (void)mk_addmember(bu_vls_addr(®ion_name), &all_head.l,
- NULL, WMOP_UNION);
+ (void)mk_addmember(bu_vls_addr(®ion_name), &all_head.l, NULL,
WMOP_UNION);
id_no++;
}
@@ -504,15 +501,12 @@
mk_lrcomb(fd_out, bu_vls_addr(®ion_name), &head, 1, (char *)NULL,
(char *)NULL, NULL, const_id, 0, mat_code, 100, 0);
if (face_count) {
- (void)mk_addmember(bu_vls_addr(®ion_name), &all_head.l,
- NULL, WMOP_UNION);
+ (void)mk_addmember(bu_vls_addr(®ion_name), &all_head.l, NULL,
WMOP_UNION);
}
} else {
- mk_lrcomb(fd_out, bu_vls_addr(®ion_name), &head, 1, (char *)NULL,
- (char *)NULL, NULL, id_no, 0, mat_code, 100, 0);
+ mk_lrcomb(fd_out, bu_vls_addr(®ion_name), &head, 1, (char *)NULL,
(char *)NULL, NULL, id_no, 0, mat_code, 100, 0);
if (face_count)
- (void)mk_addmember(bu_vls_addr(®ion_name), &all_head.l,
- NULL, WMOP_UNION);
+ (void)mk_addmember(bu_vls_addr(®ion_name), &all_head.l, NULL,
WMOP_UNION);
id_no++;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Slashdot TV. Video for Nerds. Stuff that Matters.
http://pubads.g.doubleclick.net/gampad/clk?id=160591471&iu=/4140/ostg.clktrk
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits