projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove debugging code.
[synfig.git]
/
synfig-core
/
trunk
/
src
/
synfig
/
target_tile.cpp
diff --git
a/synfig-core/trunk/src/synfig/target_tile.cpp
b/synfig-core/trunk/src/synfig/target_tile.cpp
index
c12c2d0
..
8bb06d9
100644
(file)
--- a/
synfig-core/trunk/src/synfig/target_tile.cpp
+++ b/
synfig-core/trunk/src/synfig/target_tile.cpp
@@
-6,6
+6,7
@@
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+** Copyright (c) 2007, 2008 Chris Moore
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
@@
-52,7
+53,7
@@
const unsigned int DEF_TILE_HEIGHT= TILE_SIZE / 2;
#define SYNFIG_OPTIMIZE_LAYER_TREE 1
#ifdef _DEBUG
#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 ======================================================= */
#endif
/* === G L O B A L S ======================================================= */
@@
-357,7
+358,8
@@
synfig::Target_Tile::render(ProgressCallback *cb)
#ifdef SYNFIG_OPTIMIZE_LAYER_TREE
Canvas::Handle op_canvas(Canvas::create());
#ifdef SYNFIG_OPTIMIZE_LAYER_TREE
Canvas::Handle op_canvas(Canvas::create());
- optimize_layers(canvas->get_context(), op_canvas);
+ 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();
context=op_canvas->get_context();
#else
context=canvas->get_context();
@@
-367,9
+369,10
@@
synfig::Target_Tile::render(ProgressCallback *cb)
#ifdef SYNFIG_OPTIMIZE_LAYER_TREE
Context context;
Canvas::Handle op_canvas(Canvas::create());
#ifdef SYNFIG_OPTIMIZE_LAYER_TREE
Context context;
Canvas::Handle op_canvas(Canvas::create());
+ op_canvas->set_file_name(canvas->get_file_name());
// Set the time that we wish to render
canvas->set_time(t);
// 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;
context=op_canvas->get_context();
#else
Context context;
@@
-402,7
+405,8
@@
synfig::Target_Tile::render(ProgressCallback *cb)
#ifdef SYNFIG_OPTIMIZE_LAYER_TREE
Canvas::Handle op_canvas(Canvas::create());
#ifdef SYNFIG_OPTIMIZE_LAYER_TREE
Canvas::Handle op_canvas(Canvas::create());
- optimize_layers(canvas->get_context(), op_canvas);
+ 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();
context=op_canvas->get_context();
#else
context=canvas->get_context();