Revision: 78163
http://sourceforge.net/p/brlcad/code/78163
Author: starseeker
Date: 2021-02-02 13:48:34 +0000 (Tue, 02 Feb 2021)
Log Message:
-----------
We're already catching cyclic paths with another check - update message.
Modified Paths:
--------------
brlcad/trunk/src/libged/npush/npush.cpp
Modified: brlcad/trunk/src/libged/npush/npush.cpp
===================================================================
--- brlcad/trunk/src/libged/npush/npush.cpp 2021-02-01 18:55:58 UTC (rev
78162)
+++ brlcad/trunk/src/libged/npush/npush.cpp 2021-02-02 13:48:34 UTC (rev
78163)
@@ -21,7 +21,6 @@
*
* The push command.
*
- * TODO - depth limiting pushes aren't working yet...
*/
#include "common.h"
@@ -907,7 +906,11 @@
struct directory *dp = db_lookup(dbip, s_it->c_str(), LOOKUP_NOISY);
validate_walk(dbip, dp, &s);
if (!s.valid_push) {
- bu_vls_printf(gedp->ged_result_str, "%s has another specified
target object (%s), below it.", dp->d_namep, s.problem_obj.c_str());
+ if (BU_STR_EQUAL(dp->d_namep, s.problem_obj.c_str())) {
+ bu_vls_printf(gedp->ged_result_str, "cyclic path found: %s is
below %s", dp->d_namep, s.problem_obj.c_str());
+ } else {
+ bu_vls_printf(gedp->ged_result_str, "%s has another specified
target object (%s), below it.", dp->d_namep, s.problem_obj.c_str());
+ }
return GED_ERROR;
}
}
@@ -1176,6 +1179,12 @@
return GED_ERROR;
}
+ /* TODO - test rt_db_put_internal by writing out every object to a tmp name
+ * to ensure the matrix can be successfully applied. We want to "fail
safe"
+ * so we need to test the writes first before we start altering anything
extant
+ * in the .g file. */
+
+
/* We now know everything we need. For combs and primitives that have
updates
* or are being newly created apply those changes to the .g file. Because
this
* step is destructive, it is carried out only after all characterization
steps
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
