[Igarden-commit] Garden/source/LayoutDB MaterialRef.cpp, 1.119.2.33, 1.119.2.34

[Jeffrey B. <jlb...@us...>]

Update of /cvsroot/igarden/Garden/source/LayoutDB
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv8869/source/LayoutDB

Modified Files:
      Tag: Release_branch_v1
	MaterialRef.cpp 
Log Message:
Fixes to overlap warnings

Index: MaterialRef.cpp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/LayoutDB/MaterialRef.cpp,v
retrieving revision 1.119.2.33
retrieving revision 1.119.2.34
diff -C2 -d -r1.119.2.33 -r1.119.2.34
*** MaterialRef.cpp	8 Apr 2008 22:26:50 -0000	1.119.2.33
--- MaterialRef.cpp	17 Apr 2008 22:18:41 -0000	1.119.2.34
***************
*** 1043,1049 ****
  						break;
  				}
! 				otherDistance = testMaterialRef->GetMinimumSpacing();
! 				if(otherDistance < distance)
! 					distance = otherDistance;
  			}
  			testPath = testPathElem->GetPath();
--- 1043,1047 ----
  						break;
  				}
! 				distance = (distance + otherDistance)/2;
  			}
  			testPath = testPathElem->GetPath();
***************
*** 1081,1084 ****
--- 1079,1083 ----
  						testElement->NoteOverlap(overlapPoint, (action==kAddingElement), overlapType);
  					}
+ 					NoteOverlap(overlapPoint, false, overlapType);
  				}
  			}