projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use Color::is_straight(). Also, re-enable the optimization for straight blending...
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
dock_navigator.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/dock_navigator.cpp
b/synfig-studio/trunk/src/gtkmm/dock_navigator.cpp
index
c558960
..
7141fa9
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/dock_navigator.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/dock_navigator.cpp
@@
-44,6
+44,8
@@
#include "asyncrenderer.h"
#include "asyncrenderer.h"
+#include "general.h"
+
#endif
/* === U S I N G =========================================================== */
#endif
/* === U S I N G =========================================================== */
@@
-180,7
+182,6
@@
void studio::Widget_NavView::on_finish_render()
//synfig::warning("Nav: It hath succeeded!!!");
//assert(renderer && renderer->has_success());
//synfig::warning("Nav: It hath succeeded!!!");
//assert(renderer && renderer->has_success());
- DEBUGPOINT();
//synfig::warning("Nav: now we know it really succeeded");
if(!*surface)
{
//synfig::warning("Nav: now we know it really succeeded");
if(!*surface)
{
@@
-220,7
+221,7
@@
void studio::Widget_NavView::on_finish_render()
dw, // width
dh, // height
dw*synfig::channels(pf), // stride (pitch)
dw, // width
dh, // height
dw*synfig::channels(pf), // stride (pitch)
-
SigC::slot
(freegu8)
+
sigc::ptr_fun
(freegu8)
);
}
else
);
}
else