Sync changes from upstream repository

Co-authored-by: Steve Baer <steve@mcneel.com>
Co-authored-by: Nathan Letwory <nathan@mcneel.com>
Co-authored-by: Dale Lear <dalelear@mcneel.com>
This commit is contained in:
Bozo The Builder
2019-11-05 18:13:55 -08:00
committed by Will Pearson
parent b844466e88
commit 799431a63b
130 changed files with 29557 additions and 9236 deletions

View File

@@ -30,13 +30,13 @@ static bool HasErrorsOrWarnings(ON_TextLog* log, const char* operation)
ON_String msg;
if (ON_GetErrorCount() > 0)
{
msg.Format("%d errors: %s", ON_GetErrorCount(), operation);
msg.Format("%d errors: %s\n", ON_GetErrorCount(), operation);
log->Print(msg);
return true;
}
if (ON_GetWarningCount() > 0)
{
msg.Format("%d warnings: %s", ON_GetErrorCount(), operation);
msg.Format("%d warnings: %s\n", ON_GetErrorCount(), operation);
log->Print(msg);
return true;
}
@@ -162,7 +162,7 @@ int main(int argc, const char *argv[])
// Write file
model.m_sStartSectionComments = "Converted by example_convert.exe";
bool outrc = model.Write(output, version, dump);
if (HasErrorsOrWarnings(dump, "writing output file"))
if (HasErrorsOrWarnings(dump, "writing output file\n"))
return 1;
if (outrc)