Revision: 77994
http://sourceforge.net/p/brlcad/code/77994
Author: starseeker
Date: 2020-12-17 21:10:30 +0000 (Thu, 17 Dec 2020)
Log Message:
-----------
db_diradd wasn't setting the d_major_type correctly during db_concat. Looks
like this wasn't an issue in 7.32.0, so doesn't need a news item.
Modified Paths:
--------------
brlcad/trunk/TODO
brlcad/trunk/src/libged/concat/concat.cpp
Modified: brlcad/trunk/TODO
===================================================================
--- brlcad/trunk/TODO 2020-12-17 20:40:44 UTC (rev 77993)
+++ brlcad/trunk/TODO 2020-12-17 21:10:30 UTC (rev 77994)
@@ -41,8 +41,6 @@
contexts, allowing for more than one timer to be active. Make sure
the old librt API can be obsoleted cleanly.
-* check that dbconcat supports objects created with the bo cmd
-
* libgcv should add objects to an existing .g if one is specified
as the output target - right now it's overwriting the old file
Modified: brlcad/trunk/src/libged/concat/concat.cpp
===================================================================
--- brlcad/trunk/src/libged/concat/concat.cpp 2020-12-17 20:40:44 UTC (rev
77993)
+++ brlcad/trunk/src/libged/concat/concat.cpp 2020-12-17 21:10:30 UTC (rev
77994)
@@ -283,6 +283,10 @@
return GED_ERROR;
}
+ /* db_diradd doesn't produce the correct major type for binary objects -
+ * make sure they match. */
+ new_dp->d_major_type = input_dp->d_major_type;
+
if (rt_db_put_internal(new_dp, curr_dbip, &ip, &rt_uniresource) < 0) {
bu_vls_printf(gedp->ged_result_str,
"Failed to write new object (%s) to database -
aborting!!\n",
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