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
/
synfigapp
/
main.cpp
diff --git
a/synfig-studio/trunk/src/synfigapp/main.cpp
b/synfig-studio/trunk/src/synfigapp/main.cpp
index
7c1f8bb
..
081d5f7
100644
(file)
--- a/
synfig-studio/trunk/src/synfigapp/main.cpp
+++ b/
synfig-studio/trunk/src/synfigapp/main.cpp
@@
-39,6
+39,8
@@
#include <list>
#include <list>
+#include "general.h"
+
#endif
/* === U S I N G =========================================================== */
#endif
/* === U S I N G =========================================================== */
@@
-84,7
+86,7
@@
static synfig::Waypoint::Interpolation interpolation_;
/* === M E T H O D S ======================================================= */
/* === M E T H O D S ======================================================= */
-synfigapp::Main::Main(const synfig::String &basepath,ProgressCallback *cb):
+synfigapp::Main::Main(const synfig::String &basepath,
synfig::
ProgressCallback *cb):
synfig::Main(basepath,cb),
ref_count_(synfigapp_ref_count_)
{
synfig::Main(basepath,cb),
ref_count_(synfigapp_ref_count_)
{
@@
-95,6
+97,11
@@
synfigapp::Main::Main(const synfig::String &basepath,ProgressCallback *cb):
ref_count_=synfigapp_ref_count_;
// Add initialization after this point
ref_count_=synfigapp_ref_count_;
// Add initialization after this point
+
+#ifdef ENABLE_NLS
+ bindtextdomain("synfigstudio", LOCALEDIR);
+#endif
+
action_main=new synfigapp::Action::Main();
settings_.construct();
action_main=new synfigapp::Action::Main();
settings_.construct();
@@
-376,7
+383,7
@@
synfigapp::Main::select_input_device(InputDevice::Handle input_device)
{
assert(input_device);
{
assert(input_device);
- synfig::info("Input device changed to \"%s\"",input_device->get_id().c_str());
+
//
synfig::info("Input device changed to \"%s\"",input_device->get_id().c_str());
selected_input_device_=input_device;
selected_input_device_=input_device;