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
/
dialog_setup.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/dialog_setup.cpp
b/synfig-studio/trunk/src/gtkmm/dialog_setup.cpp
index
bb12d26
..
0382ce7
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/dialog_setup.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/dialog_setup.cpp
@@
-41,6
+41,8
@@
#include <ETL/stringf>
#include <ETL/misc>
#include <ETL/stringf>
#include <ETL/misc>
+#include "general.h"
+
#endif
/* === U S I N G =========================================================== */
#endif
/* === U S I N G =========================================================== */
@@
-499,7
+501,7
@@
BlackLevelSelector::on_event(GdkEvent *event)
void
void
-Dialog_Setup::set_time_format(Time::Format x)
+Dialog_Setup::set_time_format(
synfig::
Time::Format x)
{
time_format=x;
if(x<=Time::FORMAT_VIDEO)
{
time_format=x;
if(x<=Time::FORMAT_VIDEO)