X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Ftarget_scanline.cpp;fp=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Ftarget_scanline.cpp;h=49cff08ce14d4f0b54f0bedb158cef0c86180a98;hb=ce1b253e2e2e8b19739b642c87041414fd23e5e6;hp=e43da308b1e99f5e610b798a84e38c1f228d7d59;hpb=88a052110da2502d09c39e01ab5195219069f272;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/target_scanline.cpp b/synfig-core/trunk/src/synfig/target_scanline.cpp
index e43da30..49cff08 100644
--- a/synfig-core/trunk/src/synfig/target_scanline.cpp
+++ b/synfig-core/trunk/src/synfig/target_scanline.cpp
@@ -172,14 +172,20 @@ synfig::Target_Scanline::render(ProgressCallback *cb)
 
 		Context context;
 
-		#ifdef SYNFIG_OPTIMIZE_LAYER_TREE
-		Canvas::Handle op_canvas(Canvas::create());
-		op_canvas->set_file_name(canvas->get_file_name());
-		optimize_layers(canvas->get_time(), canvas->get_context(), op_canvas);
-		context=op_canvas->get_context();
-		#else
+#ifdef SYNFIG_OPTIMIZE_LAYER_TREE
+		Canvas::Handle op_canvas;
+		if (!getenv("SYNFIG_DISABLE_OPTIMIZE_LAYER_TREE"))
+		{
+			op_canvas = Canvas::create();
+			op_canvas->set_file_name(canvas->get_file_name());
+			optimize_layers(canvas->get_time(), canvas->get_context(), op_canvas);
+			context=op_canvas->get_context();
+		}
+		else
+			context=canvas->get_context();
+#else
 		context=canvas->get_context();
-		#endif
+#endif
 
 		// If the quality is set to zero, then we
 		// use the parametric scanline-renderer.
@@ -307,14 +313,20 @@ synfig::Target_Scanline::render(ProgressCallback *cb)
 			canvas->set_time(t);
 		Context context;
 
-		#ifdef SYNFIG_OPTIMIZE_LAYER_TREE
-		Canvas::Handle op_canvas(Canvas::create());
-		op_canvas->set_file_name(canvas->get_file_name());
-		optimize_layers(canvas->get_time(), canvas->get_context(), op_canvas);
-		context=op_canvas->get_context();
-		#else
+#ifdef SYNFIG_OPTIMIZE_LAYER_TREE
+		Canvas::Handle op_canvas;
+		if (!getenv("SYNFIG_DISABLE_OPTIMIZE_LAYER_TREE"))
+		{
+			op_canvas = Canvas::create();
+			op_canvas->set_file_name(canvas->get_file_name());
+			optimize_layers(canvas->get_time(), canvas->get_context(), op_canvas);
+			context=op_canvas->get_context();
+		}
+		else
+			context=canvas->get_context();
+#else
 		context=canvas->get_context();
-		#endif
+#endif
 
 		// If the quality is set to zero, then we
 		// use the parametric scanline-renderer.