projects
/
anneal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
checkpoint
[anneal.git]
/
src
/
edu
/
berkeley
/
qfat
/
geom
/
BindingGroup.java
diff --git
a/src/edu/berkeley/qfat/geom/BindingGroup.java
b/src/edu/berkeley/qfat/geom/BindingGroup.java
index
e64cc17
..
34259ab
100644
(file)
--- a/
src/edu/berkeley/qfat/geom/BindingGroup.java
+++ b/
src/edu/berkeley/qfat/geom/BindingGroup.java
@@
-19,7
+19,7
@@
public class BindingGroup<T extends HasBindingGroup> implements Iterable<T> {
public void merge(BindingGroup<T> bg, Matrix m) {
if (bg==this) {
if (m.equalsModuloEpsilon(Matrix.ONE, 0.001f)) return;
public void merge(BindingGroup<T> bg, Matrix m) {
if (bg==this) {
if (m.equalsModuloEpsilon(Matrix.ONE, 0.001f)) return;
- System.err.println(m.getAffineConstraint(0.001f));
+ constraint = constraint.intersect(m.getAffineConstraint(0.001f), 0.001f);
return;
}
return;
}