X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fcanvas.cpp;h=f56393debd649774cf8707e0c078941d2cae070e;hb=4ec81d053bf1d0cbcd9f0bf048914ec8eca08f4c;hp=dcb702f2f47e5ca2941f01361eb0f8a6e619a37c;hpb=49739f508a1d2d1c15bead8cc1e6104a847513cd;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/canvas.cpp b/synfig-core/trunk/src/synfig/canvas.cpp
index dcb702f..f56393d 100644
--- a/synfig-core/trunk/src/synfig/canvas.cpp
+++ b/synfig-core/trunk/src/synfig/canvas.cpp
@@ -526,7 +526,7 @@ Canvas::surefind_canvas(const String &id)
 			if(is_absolute_path(file_name))
 				external_canvas=open_canvas(file_name);
 			else
-				external_canvas=open_canvas(get_file_path()+ETL_DIRECTORY_SEPERATOR+file_name);
+				external_canvas=open_canvas(get_file_path()+ETL_DIRECTORY_SEPARATOR+file_name);
 
 			if(!external_canvas)
 				throw Exception::FileNotFound(file_name);
@@ -553,7 +553,7 @@ Canvas::surefind_canvas(const String &id)
 		return new_child_canvas(id);
 	}
 
-	// If the first character is the seperator, then
+	// If the first character is the separator, then
 	// this references the root canvas.
 	if(id[0]==':')
 		return get_root()->surefind_canvas(string(id,1));
@@ -611,7 +611,7 @@ Canvas::find_canvas(const String &id)const
 			if(is_absolute_path(file_name))
 				external_canvas=open_canvas(file_name);
 			else
-				external_canvas=open_canvas(get_file_path()+ETL_DIRECTORY_SEPERATOR+file_name);
+				external_canvas=open_canvas(get_file_path()+ETL_DIRECTORY_SEPARATOR+file_name);
 
 			if(!external_canvas)
 				throw Exception::FileNotFound(file_name);
@@ -636,7 +636,7 @@ Canvas::find_canvas(const String &id)const
 		throw Exception::IDNotFound("Child Canvas in Parent Canvas: (child)"+id);
 	}
 
-	// If the first character is the seperator, then
+	// If the first character is the separator, then
 	// this references the root canvas.
 	if(id.find_first_of(':')==0)
 		return get_root()->find_canvas(string(id,1));
@@ -1036,7 +1036,7 @@ synfig::optimize_layers(Context context, Canvas::Handle op_canvas)
 			continue;
 
 		Layer_PasteCanvas* paste_canvas(static_cast<Layer_PasteCanvas*>(layer.get()));
-		if(layer->get_name()=="PasteCanvas" && paste_canvas->get_time_offset()==0)
+		if(layer->get_name()=="paste_canvas" && paste_canvas->get_time_offset()==0)
 		{
 			Canvas::Handle sub_canvas(Canvas::create_inline(op_canvas));
 			Canvas::Handle paste_sub_canvas = paste_canvas->get_sub_canvas();
@@ -1076,13 +1076,13 @@ synfig::optimize_layers(Context context, Canvas::Handle op_canvas)
 				continue;
 			}catch(int) { }
 #endif
-			Layer::Handle new_layer(Layer::create("PasteCanvas"));
-			dynamic_cast<Layer_PasteCanvas*>(new_layer.get())->set_do_not_muck_with_time(true);
+			Layer::Handle new_layer(Layer::create("paste_canvas"));
+			dynamic_cast<Layer_PasteCanvas*>(new_layer.get())->set_muck_with_time(false);
 			Layer::ParamList param_list(paste_canvas->get_param_list());
 			//param_list.erase("canvas");
 			new_layer->set_param_list(param_list);
 			dynamic_cast<Layer_PasteCanvas*>(new_layer.get())->set_sub_canvas(sub_canvas);
-			dynamic_cast<Layer_PasteCanvas*>(new_layer.get())->set_do_not_muck_with_time(false);
+			dynamic_cast<Layer_PasteCanvas*>(new_layer.get())->set_muck_with_time(true);
 			layer=new_layer;
 		}