Revision: 71648
          http://sourceforge.net/p/brlcad/code/71648
Author:   starseeker
Date:     2018-09-04 17:20:51 +0000 (Tue, 04 Sep 2018)
Log Message:
-----------
Use the same pattern for all the solidity checks

Modified Paths:
--------------
    brlcad/trunk/src/libged/facetize.c

Modified: brlcad/trunk/src/libged/facetize.c
===================================================================
--- brlcad/trunk/src/libged/facetize.c  2018-09-04 15:47:44 UTC (rev 71647)
+++ brlcad/trunk/src/libged/facetize.c  2018-09-04 17:20:51 UTC (rev 71648)
@@ -1068,12 +1068,15 @@
 
     /* Check validity - do not return an invalid BoT */
     {
-       int is_v = !bg_trimesh_solid(bot->num_vertices, bot->num_faces, 
(fastf_t *)bot->vertices, (int *)bot->faces, NULL);
-       if (!is_v) {
+       int not_solid = bg_trimesh_solid2(bot->num_vertices, bot->num_faces, 
(fastf_t *)bot->vertices, (int *)bot->faces, NULL);
+       if (not_solid) {
            r->failure_mode = GED_FACETIZE_FAILURE_BOTINVALID;
            if (bot->vertices) bu_free(bot->vertices, "verts");
            if (bot->faces) bu_free(bot->faces, "verts");
            ret = GED_FACETIZE_FAILURE;
+           if (!opts->quiet) {
+               bu_log("SPSR: facetization failed, final BoT was not solid\n", 
bot->num_faces);
+           }
            goto ged_facetize_spsr_memfree;
        }
     }
@@ -1414,12 +1417,15 @@
 
     /* Check validity - do not return an invalid BoT */
     {
-       int is_v = !bg_trimesh_solid(bot->num_vertices, bot->num_faces, 
(fastf_t *)bot->vertices, (int *)bot->faces, NULL);
-       if (!is_v) {
+       int not_solid = bg_trimesh_solid2(bot->num_vertices, bot->num_faces, 
(fastf_t *)bot->vertices, (int *)bot->faces, NULL);
+       if (not_solid) {
            r->failure_mode = GED_FACETIZE_FAILURE_BOTINVALID;
            if (bot->vertices) bu_free(bot->vertices, "verts");
            if (bot->faces) bu_free(bot->faces, "verts");
            ret = GED_FACETIZE_FAILURE;
+           if (!opts->quiet) {
+               bu_log("CM: facetization failed, final BoT was not solid\n", 
bot->num_faces);
+           }
            goto ged_facetize_continuation_memfree;
        }
     }

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits

Reply via email to