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
/
state_sketch.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/state_sketch.cpp
b/synfig-studio/trunk/src/gtkmm/state_sketch.cpp
index
cb4fd6e
..
5a8ec15
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/state_sketch.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/state_sketch.cpp
@@
-60,6
+60,8
@@
#include <gtkmm/checkbutton.h>
#include <gtkmm/actiongroup.h>
#include <gtkmm/checkbutton.h>
#include <gtkmm/actiongroup.h>
+#include "general.h"
+
#endif
/* === U S I N G =========================================================== */
#endif
/* === U S I N G =========================================================== */
@@
-487,7
+489,8
@@
StateSketch_Context::event_mouse_down_handler(const Smach::event& x)
}
case BUTTON_RIGHT: // Intercept the right-button click to short-circuit the pop-up menu
}
case BUTTON_RIGHT: // Intercept the right-button click to short-circuit the pop-up menu
- return Smach::RESULT_ACCEPT;
+ if (!getenv("SYNFIG_ENABLE_POPUP_MENU_IN_ALL_TOOLS"))
+ return Smach::RESULT_ACCEPT;
default:
return Smach::RESULT_OK;
default:
return Smach::RESULT_OK;