X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Ftarget_tile.cpp;h=ef81d5aa0b414b9e57dfc71b64c40aad7d4f6ea1;hb=1fa460ffee65518b7fce0053616798fb0070deba;hp=e16b09a3e05cfdf9b303caa87c24d603cab1703c;hpb=2e29582190069aeedc98caa9a5bcec992f59fa19;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/target_tile.cpp b/synfig-core/trunk/src/synfig/target_tile.cpp
index e16b09a..ef81d5a 100644
--- a/synfig-core/trunk/src/synfig/target_tile.cpp
+++ b/synfig-core/trunk/src/synfig/target_tile.cpp
@@ -356,14 +356,20 @@ synfig::Target_Tile::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
 
 /*
 			#ifdef SYNFIG_OPTIMIZE_LAYER_TREE
@@ -403,14 +409,20 @@ synfig::Target_Tile::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(!render_frame_(context, cb))
 				return false;