projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
AkhIL mentioned on IRC that bitmaps weren't working with 'straight onto' blending...
[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
24674bc
..
a9b876d
100644
(file)
--- 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 ========================================================= */
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_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
+357,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
+368,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
+404,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();