X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Flayerparamtreestore.cpp;h=90a88c086f8ff0a7fb793010afad4472d98259af;hb=2d0c3bfcda36f4bd3e94630d92435bb1b4492f45;hp=7c73f2d9d6c4adbe10e2228e093bc25814dded97;hpb=c11163f51e342cc35511ed559fd3c0ae5405f840;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/layerparamtreestore.cpp b/synfig-studio/trunk/src/gtkmm/layerparamtreestore.cpp
index 7c73f2d..90a88c0 100644
--- a/synfig-studio/trunk/src/gtkmm/layerparamtreestore.cpp
+++ b/synfig-studio/trunk/src/gtkmm/layerparamtreestore.cpp
@@ -6,6 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007, 2008 Chris Moore
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -321,6 +322,7 @@ LayerParamTreeStore::rebuild()
 	struct REBUILD_HELPER
 	{
 		ParamVocab vocab;
+		Layer::Handle layer_0;
 
 		static ParamVocab::iterator find_param_desc(ParamVocab& vocab, const synfig::String& x)
 		{
@@ -332,14 +334,17 @@ LayerParamTreeStore::rebuild()
 			return iter;
 		}
 
-		void process_vocab(ParamVocab x)
+		void process_vocab(synfig::Layer::Handle layer_n)
 		{
+			ParamVocab x = layer_n->get_param_vocab();
 			ParamVocab::iterator iter;
 
 			for(iter=vocab.begin();iter!=vocab.end();++iter)
 			{
-				ParamVocab::iterator iter2(find_param_desc(x,iter->get_name()));
-				if(iter2==x.end())
+				String name(iter->get_name());
+				ParamVocab::iterator iter2(find_param_desc(x,name));
+				if(iter2==x.end() ||
+				   layer_0->get_param(name).get_type() != layer_n->get_param(name).get_type())
 				{
 					// remove it and start over
 					vocab.erase(iter);
@@ -356,10 +361,11 @@ LayerParamTreeStore::rebuild()
 	{
 		LayerList::iterator iter(layer_list.begin());
 		rebuild_helper.vocab=(*iter)->get_param_vocab();
+		rebuild_helper.layer_0=*iter;
 
 		for(++iter;iter!=layer_list.end();++iter)
 		{
-			rebuild_helper.process_vocab((*iter)->get_param_vocab());
+			rebuild_helper.process_vocab(*iter);
 			changed_connection_list.push_back(
 				(*iter)->signal_changed().connect(
 					sigc::mem_fun(