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

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

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

Modified Files:
      Tag: Release_branch_v1
	MaterialRef.cpp 
Log Message:
Improve performance of startup by only merging source material when changed.

Index: MaterialRef.cpp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/LayoutDB/MaterialRef.cpp,v
retrieving revision 1.119.2.4
retrieving revision 1.119.2.5
diff -C2 -d -r1.119.2.4 -r1.119.2.5
*** MaterialRef.cpp	29 Nov 2006 12:19:25 -0000	1.119.2.4
--- MaterialRef.cpp	12 Dec 2006 00:58:41 -0000	1.119.2.5
***************
*** 775,783 ****
  		else if(strcmp(dataObj->GetTag(), "Years") == 0)
  		{
  			instObj = dataObj->GetChild();
  			while(instObj != NULL)
  			{
  				inst = new InstanceData(nilID, this);
! 				inst->ParseObjectXML(instObj, true);
  				_attributes.push_back(inst);
  				instObj = instObj->GetSibling();
--- 775,785 ----
  		else if(strcmp(dataObj->GetTag(), "Years") == 0)
  		{
+ 			xmlReadContext_t	context;
+ 			
  			instObj = dataObj->GetChild();
  			while(instObj != NULL)
  			{
  				inst = new InstanceData(nilID, this);
! 				inst->ParseObjectXML(instObj, true, context);
  				_attributes.push_back(inst);
  				instObj = instObj->GetSibling();