Merge branch 'master' into genete_core_review

[synfig.git] / synfig-core / src / synfig / layer_pastecanvas.cpp

diff --git a/synfig-core/src/synfig/layer_pastecanvas.cpp b/synfig-core/src/synfig/layer_pastecanvas.cpp
index 3fafb8e..cd61506 100644 (file)
--- a/synfig-core/src/synfig/layer_pastecanvas.cpp
+++ b/synfig-core/src/synfig/layer_pastecanvas.cpp
@@ -274,13 +274,10 @@ Layer_PasteCanvas::update_renddesc()
 void
 Layer_PasteCanvas::on_canvas_set()
 {
-       //synfig::info("before count()=%d",count());
        if(get_canvas() && canvas && canvas->is_inline() && canvas->parent()!=get_canvas())
        {
-               //synfig::info("during count()=%d",count());
                canvas->set_inline(get_canvas());
        }
-       //synfig::info("after count()=%d",count());
 }
 
 ValueBase
@@ -385,7 +382,7 @@ Layer_PasteCanvas::accelerated_render(Context context,Surface *surface,int quali
        else if (!context.accelerated_render(surface,quality,renddesc,&stageone))
                return false;
 
-       if(muck_with_time_ && curr_time!=Time::begin() && canvas->get_time()!=curr_time+time_offset)
+       if(muck_with_time_ && curr_time!=Time::begin() /*&& canvas->get_time()!=curr_time+time_offset*/)
                canvas->set_time(curr_time+time_offset);
 
        Color::BlendMethod blend_method(get_blend_method());