Revision: 78136
http://sourceforge.net/p/brlcad/code/78136
Author: starseeker
Date: 2021-01-27 19:03:16 +0000 (Wed, 27 Jan 2021)
Log Message:
-----------
Fix matrix sorting, only look at solid flag if dp isn't a comb
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-01-27 18:25:39 UTC (rev
78135)
+++ brlcad/trunk/src/libged/npush/npush.cpp 2021-01-27 19:03:16 UTC (rev
78136)
@@ -104,11 +104,13 @@
// of the matrices involved is non-IDN - otherwise, the
// matrix applications are no-ops and we don't want them
// to prompt multiple instances of objects.
- if (apply_to_solid != o.apply_to_solid) {
- if (!bn_mat_is_equal(mat, bn_mat_identity, ts_tol) ||
- !bn_mat_is_equal(o.mat, bn_mat_identity, ts_tol)) {
- if (apply_to_solid && !o.apply_to_solid)
- return true;
+ if (!(dp->d_flags & RT_DIR_COMB)) {
+ if (apply_to_solid != o.apply_to_solid) {
+ if (!bn_mat_is_equal(mat, bn_mat_identity, ts_tol) ||
+ !bn_mat_is_equal(o.mat, bn_mat_identity, ts_tol)) {
+ if (apply_to_solid && !o.apply_to_solid)
+ return true;
+ }
}
}
@@ -128,6 +130,9 @@
if (mat[i] < o.mat[i]) {
return true;
}
+ if (mat[i] > o.mat[i]) {
+ return false;
+ }
}
}
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
