X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fcanvas.cpp;h=6404b84df6c498f9baa848d61b00eb81803b7545;hb=1905325be0aa16501c1a802b70da251fb5657b43;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..6404b84 100644 --- a/synfig-core/trunk/src/synfig/canvas.cpp +++ b/synfig-core/trunk/src/synfig/canvas.cpp @@ -1036,7 +1036,7 @@ synfig::optimize_layers(Context context, Canvas::Handle op_canvas) continue; Layer_PasteCanvas* paste_canvas(static_cast(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(new_layer.get())->set_do_not_muck_with_time(true); + Layer::Handle new_layer(Layer::create("paste_canvas")); + dynamic_cast(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(new_layer.get())->set_sub_canvas(sub_canvas); - dynamic_cast(new_layer.get())->set_do_not_muck_with_time(false); + dynamic_cast(new_layer.get())->set_muck_with_time(true); layer=new_layer; }