X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fworkarea.cpp;h=228c087695d0d1835abb32be0465d56eb8762ce8;hb=f7c2dc75685bf7dfce2b8152656938f66d6df11e;hp=3a9cd0396fc530553d37ab187269e0cf4755abdc;hpb=d4d94c626d5cf4766cf32781cd8088de3b5683f8;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/workarea.cpp b/synfig-studio/trunk/src/gtkmm/workarea.cpp
index 3a9cd03..228c087 100644
--- a/synfig-studio/trunk/src/gtkmm/workarea.cpp
+++ b/synfig-studio/trunk/src/gtkmm/workarea.cpp
@@ -72,6 +72,8 @@
 
 #include <synfig/mutex.h>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -2240,8 +2242,11 @@ studio::WorkArea::async_update_preview()
 	// Create the render target
 	handle<Target> target;
 
-	if(w*h>(low_resolution?480*270:480*270/2))
+	// if we have lots of pixels to render and the tile renderer isn't disabled, use it
+	if(w*h>(low_resolution?480*270:480*270/2) &&
+	   !getenv("SYNFIG_DISABLE_TILE_RENDER"))
 	{
+		// do a tile render
 		handle<WorkAreaTarget> trgt(new class WorkAreaTarget(this,w,h));
 
 		trgt->set_rend_desc(&desc);
@@ -2250,6 +2255,7 @@ studio::WorkArea::async_update_preview()
 	}
 	else
 	{
+		// do a scanline render
 		handle<WorkAreaTarget_Full> trgt(new class WorkAreaTarget_Full(this,w,h));
 
 		trgt->set_rend_desc(&desc);
@@ -2274,7 +2280,7 @@ studio::WorkArea::async_update_preview()
 	synfig::ProgressCallback *cb=get_canvas_view()->get_ui_interface().get();
 
 	rendering=true;
-	cb->task("Rendering...");
+	cb->task(_("Rendering..."));
 	rendering=true;
 
 	return true;
@@ -2296,12 +2302,12 @@ studio::WorkArea::async_update_finished()
 	{
 		dirty=false;
 		//queued=false;
-		cb->task("Idle");
+		cb->task(_("Idle"));
 	}
 	else
 	{
 		dirty=true;
-		cb->task("Render Failed");
+		cb->task(_("Render Failed"));
 	}
 	//get_canvas_view()->reset_cancel_status();
 	done_rendering();
@@ -2375,7 +2381,7 @@ again:
 	target->set_avoid_time_sync(true);
 
 	if(cb)
-		cb->task(strprintf("Rendering canvas %s...",get_canvas()->get_name().c_str()));
+		cb->task(strprintf(_("Rendering canvas %s..."),get_canvas()->get_name().c_str()));
 
 	bool ret = target->render(cb);
 
@@ -2391,9 +2397,9 @@ again:
 	if(cb)
 	{
 		if(ret)
-			cb->task("Idle");
+			cb->task(_("Idle"));
 		else
-			cb->task("Render Failed");
+			cb->task(_("Render Failed"));
 		cb->amount_complete(0,1);
 	}
 
@@ -2416,7 +2422,7 @@ again:
 }
 
 void
-studio::WorkArea::async_render_preview(Time time)
+studio::WorkArea::async_render_preview(synfig::Time time)
 {
 	cur_time=time;
 	//tile_book.clear();
@@ -2437,7 +2443,7 @@ WorkArea::async_render_preview()
 }
 
 bool
-studio::WorkArea::sync_render_preview(Time time)
+studio::WorkArea::sync_render_preview(synfig::Time time)
 {
 	cur_time=time;
 	//tile_book.clear();