X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Ftarget_tile.cpp;h=92665d21ef49fc595639861ff2b3c309974ac35d;hb=1bca79bccbe3fb2dd214c7fd2d765ea3ac26c387;hp=803dbd2511b6e54be09b938151f6016dfd359de3;hpb=f42aae66d091f2c43e60b5d92335ea5b0d237c23;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/target_tile.cpp b/synfig-core/trunk/src/synfig/target_tile.cpp
index 803dbd2..92665d2 100644
--- a/synfig-core/trunk/src/synfig/target_tile.cpp
+++ b/synfig-core/trunk/src/synfig/target_tile.cpp
@@ -47,12 +47,12 @@ using namespace etl;
 using namespace synfig;
 
 /* === M A C R O S ========================================================= */
-const unsigned int	DEF_TILE_WIDTH = 64;
-const unsigned int	DEF_TILE_HEIGHT= 64;
+const unsigned int	DEF_TILE_WIDTH = TILE_SIZE / 2;
+const unsigned int	DEF_TILE_HEIGHT= TILE_SIZE / 2;
 
 #define SYNFIG_OPTIMIZE_LAYER_TREE 	1
 #ifdef _DEBUG
-#define SYNFIG_DISPLAY_EFFICIENCY	1
+// #define SYNFIG_DISPLAY_EFFICIENCY	1
 #endif
 
 /* === G L O B A L S ======================================================= */
@@ -276,6 +276,7 @@ synfig::Target_Tile::render_frame_(Context context,ProgressCallback *cb)
 				add_tile_time+=timer();
 			}
 			tile_timer.reset();
+			signal_progress()();
 		}
 	}
 	if(cb && !cb->amount_complete(total_tiles,total_tiles))
@@ -307,7 +308,7 @@ synfig::Target_Tile::render(ProgressCallback *cb)
 	curr_frame_=0;
 	init();
 	if( !init() ){
-		if(cb) cb->error(_("Target initialisation failure"));
+		if(cb) cb->error(_("Target initialization failure"));
 		return false;
 	}
 
@@ -356,7 +357,7 @@ synfig::Target_Tile::render(ProgressCallback *cb)
 
 			#ifdef SYNFIG_OPTIMIZE_LAYER_TREE
 			Canvas::Handle op_canvas(Canvas::create());
-			optimize_layers(canvas->get_context(), op_canvas);
+			optimize_layers(canvas->get_time(), canvas->get_context(), op_canvas);
 			context=op_canvas->get_context();
 			#else
 			context=canvas->get_context();
@@ -368,7 +369,7 @@ synfig::Target_Tile::render(ProgressCallback *cb)
 			Canvas::Handle op_canvas(Canvas::create());
 			// Set the time that we wish to render
 			canvas->set_time(t);
-			optimize_layers(canvas->get_context(), op_canvas);
+			optimize_layers(canvas->get_time(), canvas->get_context(), op_canvas);
 			context=op_canvas->get_context();
 			#else
 			Context context;
@@ -401,7 +402,7 @@ synfig::Target_Tile::render(ProgressCallback *cb)
 
 			#ifdef SYNFIG_OPTIMIZE_LAYER_TREE
 			Canvas::Handle op_canvas(Canvas::create());
-			optimize_layers(canvas->get_context(), op_canvas);
+			optimize_layers(canvas->get_time(), canvas->get_context(), op_canvas);
 			context=op_canvas->get_context();
 			#else
 			context=canvas->get_context();