From 52ebd9090c8291b419849f24ccd8977654dd5bb6 Mon Sep 17 00:00:00 2001
From: Nehon <remy.bouquet@gmail.com>
Date: Tue, 17 Feb 2015 20:35:37 +0100
Subject: [PATCH] Prevented scaling to kick in when pressing ctrl+S in the SDK
 to save the scene.

---
 .../src/com/jme3/gde/scenecomposer/tools/SelectTool.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/tools/SelectTool.java b/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/tools/SelectTool.java
index 0e67666fb..43d3cba3a 100644
--- a/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/tools/SelectTool.java
+++ b/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/tools/SelectTool.java
@@ -93,7 +93,7 @@ public class SelectTool extends SceneEditTool {
             return; // only do anything if a spatial is selected
         }
         // key released
-        if (kie.isReleased()) {
+        if (kie.isPressed()) {
             boolean commandUsed = checkCommandKey(kie);
             boolean stateChange = checkStateKey(kie);
             boolean axisChange = checkAxisKey(kie);
@@ -268,7 +268,7 @@ public class SelectTool extends SceneEditTool {
 
     private boolean checkStateKey(KeyInputEvent kie) {
         Spatial selected = toolController.getSelectedSpatial();
-        if (kie.getKeyCode() == KeyInput.KEY_G) {
+        if (kie.getKeyCode() == KeyInput.KEY_G && !ctrlDown) {
             currentState = State.translate;
             MoveManager moveManager = Lookup.getDefault().lookup(MoveManager.class);
             moveManager.reset();
@@ -276,10 +276,10 @@ public class SelectTool extends SceneEditTool {
             moveManager.initiateMove(selected, rot, false);
             moving = moveManager.makeUndo();
             return true;
-        } else if (kie.getKeyCode() == KeyInput.KEY_R) {
+        } else if (kie.getKeyCode() == KeyInput.KEY_R && !ctrlDown) {
             currentState = State.rotate;
             return true;
-        } else if (kie.getKeyCode() == KeyInput.KEY_S) {
+        } else if (kie.getKeyCode() == KeyInput.KEY_S && !ctrlDown) {
             currentState = State.scale;
             return true;
         }