From d2d86d649be97ebbc53f664c369b4b2271f86088 Mon Sep 17 00:00:00 2001 From: "bre..om" Date: Wed, 24 Jul 2013 16:51:19 +0000 Subject: [PATCH] switched the colors for Y & Z in the axis marker git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10736 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- .../src/com/jme3/gde/scenecomposer/SceneEditTool.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneEditTool.java b/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneEditTool.java index 725e9f210..d2767781c 100644 --- a/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneEditTool.java +++ b/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneEditTool.java @@ -130,7 +130,7 @@ public abstract class SceneEditTool { public void doUpdateToolsTransformation() { if (toolController.getSelectedSpatial() != null) { axisMarker.setLocalTranslation(toolController.getSelectedSpatial().getWorldTranslation()); - axisMarker.setLocalRotation(toolController.getSelectedSpatial().getWorldRotation()); + axisMarker.setLocalRotation(toolController.getSelectedSpatial().getLocalRotation()); setAxisMarkerScale(toolController.getSelectedSpatial()); } else { axisMarker.setLocalTranslation(Vector3f.ZERO); @@ -471,8 +471,8 @@ public abstract class SceneEditTool { protected void setDefaultAxisMarkerColors() { axisMarker.getChild("arrowX").setMaterial(redMat); - axisMarker.getChild("arrowY").setMaterial(blueMat); - axisMarker.getChild("arrowZ").setMaterial(greenMat); + axisMarker.getChild("arrowY").setMaterial(greenMat); + axisMarker.getChild("arrowZ").setMaterial(blueMat); quadXY.setMaterial(yellowMat); quadXZ.setMaterial(magentaMat); quadYZ.setMaterial(cyanMat);