X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Flayer.cpp;h=b7d8307615ca2f4ebb548d7f51ff2c6fa6080343;hb=dd77396ef0832460e05b4ce99a5e9f552424d9e2;hp=8d6ae4a4794afe4fc9660f31e108d277661599ab;hpb=cc54c38609ee9745ad678e5e9b9d7d2912be9c95;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/layer.cpp b/synfig-core/trunk/src/synfig/layer.cpp
index 8d6ae4a..b7d8307 100644
--- a/synfig-core/trunk/src/synfig/layer.cpp
+++ b/synfig-core/trunk/src/synfig/layer.cpp
@@ -98,11 +98,10 @@ Layer::subsys_init()
 #define INCLUDE_LAYER(class)  	synfig::Layer::book()[synfig::String(class::name__)]=BookEntry(class::create,class::name__,class::local_name__,class::category__,class::cvs_id__,class::version__)
 #define LAYER_ALIAS(class,alias)  	synfig::Layer::book()[synfig::String(alias)]=synfig::Layer::BookEntry(class::create,alias,alias,_("Do Not Use"),class::cvs_id__,class::version__);
 
-	INCLUDE_LAYER(Layer_SolidColor);
-	INCLUDE_LAYER(Layer_PasteCanvas);
-	INCLUDE_LAYER(Layer_Polygon);
-	LAYER_ALIAS(Layer_Polygon,"Polygon");
-	INCLUDE_LAYER(Layer_MotionBlur);
+	INCLUDE_LAYER(Layer_SolidColor);	LAYER_ALIAS(Layer_SolidColor,"SolidColor");
+	INCLUDE_LAYER(Layer_PasteCanvas);	LAYER_ALIAS(Layer_PasteCanvas,"PasteCanvas");
+	INCLUDE_LAYER(Layer_Polygon);		LAYER_ALIAS(Layer_Polygon,"Polygon");
+	INCLUDE_LAYER(Layer_MotionBlur);	LAYER_ALIAS(Layer_MotionBlur,"MotionBlur");
 
 #undef INCLUDE_LAYER
 
@@ -266,7 +265,7 @@ Layer::on_changed()
 bool
 Layer::set_param(const String &param, const ValueBase &value)
 {
-	if(param=="z_depth" && value.same_as(z_depth_))
+	if(param=="z_depth" && value.same_type_as(z_depth_))
 	{
 		z_depth_=value.get(z_depth_);
 		return true;
@@ -324,7 +323,7 @@ Layer::clone(const GUID& deriv_guid) const
 
 			// This parameter is a canvas.  We need a close look.
 			Canvas::Handle canvas(iter->second.get(Canvas::Handle()));
-			if(canvas->is_inline())
+			if(canvas && canvas->is_inline())
 			{
 				// This parameter is an inlinecanvas! we need to clone it
 				// before we set it as aparameter.