[Igarden-commit] Garden/source/LayoutDB MaterialRef.cpp, 1.119.2.5, 1.119.2.6

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

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

Modified Files:
      Tag: Release_branch_v1
	MaterialRef.cpp 
Log Message:
BUG: Plants could sometimes show up with a spread of their height.  Most noticeable with tall thin plants like sunflower.

Index: MaterialRef.cpp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/LayoutDB/MaterialRef.cpp,v
retrieving revision 1.119.2.5
retrieving revision 1.119.2.6
diff -C2 -d -r1.119.2.5 -r1.119.2.6
*** MaterialRef.cpp	12 Dec 2006 00:58:41 -0000	1.119.2.5
--- MaterialRef.cpp	26 Dec 2006 15:44:34 -0000	1.119.2.6
***************
*** 2004,2008 ****
  		{
  			if(!before->isEmpty(instanceAttr))
! 				before->GetHeight(temp, result);
  		}
  		else if(after != NULL && before != NULL)
--- 2004,2013 ----
  		{
  			if(!before->isEmpty(instanceAttr))
! 			{
! 				if(attrID == kPlantHeight)
! 					before->GetHeight(temp, result);
! 				else
! 					before->GetSpread(temp, result);
! 			}
  		}
  		else if(after != NULL && before != NULL)