X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fstate_draw.cpp;h=1b68e0fe222e487b08e548f2420c59824a1e5b72;hb=b289bc06a054acb7a61f887d19b9bfc0b7793d9c;hp=5ffdd37803e33509247b92764c8f0071d16f95fd;hpb=e697fea5db64ff7d4c9dd285775c80765788a031;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/state_draw.cpp b/synfig-studio/trunk/src/gtkmm/state_draw.cpp
index 5ffdd37..1b68e0f 100644
--- a/synfig-studio/trunk/src/gtkmm/state_draw.cpp
+++ b/synfig-studio/trunk/src/gtkmm/state_draw.cpp
@@ -588,7 +588,8 @@ StateDraw_Context::event_mouse_down_handler(const Smach::event& x)
 		}
 
 	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;