Revision: 68928
http://sourceforge.net/p/brlcad/code/68928
Author: starseeker
Date: 2016-09-28 22:01:42 +0000 (Wed, 28 Sep 2016)
Log Message:
-----------
Fix while test and apply mk_bot fixes (thanks to Vasco Alexandre da Silva Costa
for catching these)
Modified Paths:
--------------
brlcad/trunk/src/conv/k-g.cpp
Modified: brlcad/trunk/src/conv/k-g.cpp
===================================================================
--- brlcad/trunk/src/conv/k-g.cpp 2016-09-28 20:54:08 UTC (rev 68927)
+++ brlcad/trunk/src/conv/k-g.cpp 2016-09-28 22:01:42 UTC (rev 68928)
@@ -272,7 +272,7 @@
std::string remainder = line.substr(i,incr);
if (remainder.find_first_not_of(" \t\n\v\f\r") ==
std::string::npos) {
std::getline(infile, line);
- while (line.c_str()[0] == '$' && !line.c_str()[0] == '$') {
+ while (line.c_str()[0] == '$' && !line.c_str()[0] == '*') {
std::getline(infile, line);
};
i = 0;
@@ -445,7 +445,7 @@
} else {
bu_vls_sprintf(&sname, "uncategorized.bot");
}
- mk_bot(fd_out, bu_vls_addr(&sname), RT_BOT_SURFACE, RT_BOT_UNORIENTED,
NULL, NIDs.size(), eind, bot_vertices, bot_faces, NULL, NULL);
+ mk_bot(fd_out, bu_vls_addr(&sname), RT_BOT_SURFACE, RT_BOT_UNORIENTED, 0,
NIDs.size(), eind, bot_vertices, bot_faces, NULL, NULL);
/* Add the BoT to the parent Comb*/
(void)mk_addmember(bu_vls_addr(&sname), &(*head).l, NULL, WMOP_UNION);
@@ -522,7 +522,7 @@
struct bu_vls sname = BU_VLS_INIT_ZERO;
bu_vls_sprintf(&sname, "%ld.bot", pid);
- mk_bot(fd_out, bu_vls_addr(&sname), RT_BOT_SURFACE, RT_BOT_UNORIENTED,
NULL, NIDs.size(), EIDs.size() * 2, bot_vertices, bot_faces, NULL, NULL);
+ mk_bot(fd_out, bu_vls_addr(&sname), RT_BOT_SURFACE, RT_BOT_UNORIENTED, 0,
NIDs.size(), EIDs.size() * 2, bot_vertices, bot_faces, NULL, NULL);
/* Add the BoT to the parent Comb*/
(void)mk_addmember(bu_vls_addr(&sname), &(*head).l, NULL, WMOP_UNION);
bu_vls_free(&sname);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
