[brlcad-commits] SF.net SVN: brlcad:[65333] brlcad/trunk/src/libgcv/conv/fastgen4/ fastgen4_write.cpp

[ejno]

Revision: 65333
          http://sourceforge.net/p/brlcad/code/65333
Author:   ejno
Date:     2015-06-16 19:37:48 +0000 (Tue, 16 Jun 2015)
Log Message:
-----------
skip primitives in ignored regions

Modified Paths:
--------------
    brlcad/trunk/src/libgcv/conv/fastgen4/fastgen4_write.cpp

Modified: brlcad/trunk/src/libgcv/conv/fastgen4/fastgen4_write.cpp
===================================================================
--- brlcad/trunk/src/libgcv/conv/fastgen4/fastgen4_write.cpp    2015-06-16 
19:35:01 UTC (rev 65332)
+++ brlcad/trunk/src/libgcv/conv/fastgen4/fastgen4_write.cpp    2015-06-16 
19:37:48 UTC (rev 65333)
@@ -1804,12 +1804,12 @@
 
 
 bool
-FastgenConversion::RegionManager::member_ignored(const directory &member_dir)
-const
+FastgenConversion::RegionManager::member_ignored(
+    const directory &member_dir) const
 {
     RT_CK_DIR(&member_dir);
 
-    return m_walls.second.count(&member_dir);
+    return !m_enabled || m_walls.second.count(&member_dir);
 }
 
 
@@ -2111,9 +2111,9 @@
 
        try {
            write_bot(section, *bot);
-       } catch (const std::runtime_error &e) {
-           bu_log("FAILURE: write_bot() failed on object '%s': %s\n",
-                  AutoPtr<char>(db_path_to_string(path)).ptr, e.what());
+       } catch (...) {
+           internal.idb_meth->ft_ifree(&internal);
+           throw;
        }
 
        internal.idb_meth->ft_ifree(&internal);
@@ -2156,12 +2156,7 @@
        && data.get_region(*region_dir).member_ignored(get_parent_dir(*path)))
        converted = true;
     else
-       try {
-           converted = convert_primitive(data, *path, *internal);
-       } catch (const std::runtime_error &e) {
-           bu_log("FAILURE: convert_primitive() failed on object '%s': %s\n",
-                  AutoPtr<char>(db_path_to_string(path)).ptr, e.what());
-       }
+       converted = convert_primitive(data, *path, *internal);
 
     if (!converted)
        return nmg_booltree_leaf_tess(tree_state, path, internal, client_data);

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


------------------------------------------------------------------------------
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits