Editor code convention edits. Use Alt+W for color wheel in both hotkey modes.

Docs/GettingStarted.dox

@@ -761,6 +761,7 @@ Ctrl+W             - Cycle through solid, wireframe and point rendering
 Ctrl+Z             - Undo
 Ctrl+Y             - Redo
 Ctrl+Space         - Open quick menu
+Alt+W              - Open color wheel menu
 ESC                - Close the file selector or editor settings window
 DEL                - Delete node or component
 F1                 - Toggle console
@@ -797,10 +798,10 @@ Alt+P              - Unparent scene node
 Ctrl+P             - Parent all selected scene nodes to last selected node
 Z                  - Cycle through solid, wireframe and point rendering
 M                  - Show/Hide LayerEditor
-F                  - Focus on selected object (LookAt)               
+F                  - Focus on selected object (LookAt)
 X                  - Delete node or component
 Alt+D              - Smart Duplicate (note: select one of axises on gizmo to show direction for next instance)
-Key "." or Del     - View Closer selected node(s)  
+Key "." or Del     - View Closer selected node(s)
 \endverbatim
 
 Press right mouse button in the 3D view if you want to defocus the active window without changing the object selection.

bin/Data/Scripts/Editor/EditorUI.as

@@ -98,9 +98,9 @@ void CreateUI()
     SubscribeToEvent("MouseButtonUp", "UnfadeUI");
     SubscribeToEvent("ChangeLanguage", "HandleChangeLanguage");
     
-    SubscribeToEvent("WheelChangeColor", "HandleWheelChangeColor" );
-    SubscribeToEvent("WheelSelectColor", "HandleWheelSelectColor" );
-    SubscribeToEvent("WheelDiscardColor", "HandleWheelDiscardColor" );
+    SubscribeToEvent("WheelChangeColor", "HandleWheelChangeColor");
+    SubscribeToEvent("WheelSelectColor", "HandleWheelSelectColor");
+    SubscribeToEvent("WheelDiscardColor", "HandleWheelDiscardColor");
 }
 
 void ResizeUI()
@@ -332,17 +332,17 @@ void CreateMenuBar()
         CreateChildDivider(popup);
         popup.AddChild(CreateMenuItem("Cut", @Cut, 'X', QUAL_CTRL));
         
-        if ( hotKeyMode == HOTKEYS_MODE_STANDARD )
+        if (hotKeyMode == HOTKEYS_MODE_STANDARD)
             popup.AddChild(CreateMenuItem("Duplicate", @Duplicate, 'D', QUAL_CTRL));
-        else if ( hotKeyMode == HOTKEYS_MODE_BLENDER )
-            popup.AddChild(CreateMenuItem("Duplicate", @Duplicate, 'D', QUAL_SHIFT ));
+        else if (hotKeyMode == HOTKEYS_MODE_BLENDER)
+            popup.AddChild(CreateMenuItem("Duplicate", @Duplicate, 'D', QUAL_SHIFT));
         
         popup.AddChild(CreateMenuItem("Copy", @Copy, 'C', QUAL_CTRL));
         popup.AddChild(CreateMenuItem("Paste", @Paste, 'V', QUAL_CTRL));
         
-        if ( hotKeyMode == HOTKEYS_MODE_STANDARD )
+        if (hotKeyMode == HOTKEYS_MODE_STANDARD)
             popup.AddChild(CreateMenuItem("Delete", @Delete, KEY_DELETE, QUAL_ANY));
-        else if ( hotKeyMode == HOTKEYS_MODE_BLENDER )
+        else if (hotKeyMode == HOTKEYS_MODE_BLENDER)
             popup.AddChild(CreateMenuItem("Delete", @BlenderModeDelete, 'X', QUAL_ANY));
         
         popup.AddChild(CreateMenuItem("Select all", @SelectAll, 'A', QUAL_CTRL));
@@ -352,55 +352,55 @@ void CreateMenuBar()
         popup.AddChild(CreateMenuItem("Reset to default", @ResetToDefault));
         CreateChildDivider(popup);
         
-        if ( hotKeyMode == HOTKEYS_MODE_STANDARD )    
+        if (hotKeyMode == HOTKEYS_MODE_STANDARD)    
         {
             popup.AddChild(CreateMenuItem("Reset position", @SceneResetPosition));
             popup.AddChild(CreateMenuItem("Reset rotation", @SceneResetRotation));
             popup.AddChild(CreateMenuItem("Reset scale", @SceneResetScale));
         }
-        else if ( hotKeyMode == HOTKEYS_MODE_BLENDER )
+        else if (hotKeyMode == HOTKEYS_MODE_BLENDER)
         { 
             popup.AddChild(CreateMenuItem("Reset position", @SceneResetPosition, 'G' , QUAL_ALT));
-            popup.AddChild(CreateMenuItem("Reset rotation", @SceneResetRotation, 'R', QUAL_ALT ));
+            popup.AddChild(CreateMenuItem("Reset rotation", @SceneResetRotation, 'R', QUAL_ALT));
             popup.AddChild(CreateMenuItem("Reset scale", @SceneResetScale, 'S', QUAL_ALT));
         }
         
-        if ( hotKeyMode == HOTKEYS_MODE_STANDARD ) 
+        if (hotKeyMode == HOTKEYS_MODE_STANDARD) 
         {
             popup.AddChild(CreateMenuItem("Enable/disable", @SceneToggleEnable, 'E', QUAL_CTRL));
             popup.AddChild(CreateMenuItem("Enable all", @SceneEnableAllNodes, 'E', QUAL_ALT));
         }
-        else if ( hotKeyMode == HOTKEYS_MODE_BLENDER )
+        else if (hotKeyMode == HOTKEYS_MODE_BLENDER)
         {
             popup.AddChild(CreateMenuItem("Enable/disable", @SceneToggleEnable, 'H'));
             popup.AddChild(CreateMenuItem("Enable all", @SceneEnableAllNodes, 'H', QUAL_ALT));
         }
         
-        if ( hotKeyMode == HOTKEYS_MODE_STANDARD )
+        if (hotKeyMode == HOTKEYS_MODE_STANDARD)
             popup.AddChild(CreateMenuItem("Unparent", @SceneUnparent, 'U', QUAL_CTRL));
-        else if ( hotKeyMode == HOTKEYS_MODE_BLENDER )
+        else if (hotKeyMode == HOTKEYS_MODE_BLENDER)
             popup.AddChild(CreateMenuItem("Unparent", @SceneUnparent, 'P', QUAL_ALT));
 
-        if ( hotKeyMode == HOTKEYS_MODE_STANDARD )
+        if (hotKeyMode == HOTKEYS_MODE_STANDARD)
             popup.AddChild(CreateMenuItem("Parent to last", @NodesParentToLastSelected, 'U'));
-        else if ( hotKeyMode == HOTKEYS_MODE_BLENDER )
+        else if (hotKeyMode == HOTKEYS_MODE_BLENDER)
             popup.AddChild(CreateMenuItem("Parent to last", @NodesParentToLastSelected, 'P', QUAL_CTRL));
 
         CreateChildDivider(popup);
         
-        if ( hotKeyMode == HOTKEYS_MODE_STANDARD )
+        if (hotKeyMode == HOTKEYS_MODE_STANDARD)
             popup.AddChild(CreateMenuItem("Toggle update", @ToggleSceneUpdate, 'P', QUAL_CTRL));
-        //else if ( hotKeyMode == HOT_KEYS_MODE_BLENDER )
+        //else if (hotKeyMode == HOT_KEYS_MODE_BLENDER)
         //    popup.AddChild(CreateMenuItem("Toggle update", @ToggleSceneUpdate, 'P', QUAL_CTRL));
         
-        if ( hotKeyMode == HOTKEYS_MODE_BLENDER ) 
+        if (hotKeyMode == HOTKEYS_MODE_BLENDER) 
         {
              popup.AddChild(CreateMenuItem("Move to layer", @ShowLayerMover, 'M'));
              popup.AddChild(CreateMenuItem("Smart Duplicate", @SceneSmartDuplicateNode, 'D', QUAL_ALT));
              popup.AddChild(CreateMenuItem("View closer", @ViewCloser, KEY_KP_PERIOD));
-             popup.AddChild(CreateMenuItem("Color wheel", @ColorWheelBuildMenuSelectTypeColor, 'W', QUAL_ALT));                     
         }
-        
+        popup.AddChild(CreateMenuItem("Color wheel", @ColorWheelBuildMenuSelectTypeColor, 'W', QUAL_ALT));
+
         CreateChildDivider(popup);
         
         popup.AddChild(CreateMenuItem("Stop test animation", @StopTestAnimation));
@@ -1183,7 +1183,7 @@ void HandleUIElementDefaultStyle(StringHash eventType, VariantMap& eventData)
     SetUIElementDefaultStyle(ExtractFileName(eventData));
 }
 
-void HandleHotKeysBlender( VariantMap& eventData ) 
+void HandleHotKeysBlender( VariantMap& eventData) 
 {
     int key = eventData["Key"].GetInt();
     int viewDirection = eventData["Qualifiers"].GetInt() == QUAL_CTRL ? -1 : 1;
@@ -1328,7 +1328,7 @@ void HandleHotKeysBlender( VariantMap& eventData )
                  ReacquireCameraYawPitch();
             } 
          }
-         else if ( eventData["Qualifiers"].GetInt() != QUAL_CTRL) // set transformations
+         else if (eventData["Qualifiers"].GetInt() != QUAL_CTRL) // set transformations
          {
                 if (key == KEY_G) 
                 {
@@ -1370,7 +1370,7 @@ void HandleHotKeysBlender( VariantMap& eventData )
     toolBarDirty = true;
 }
 
-void HandleHotKeysStandart ( VariantMap& eventData) 
+void HandleHotKeysStandard(VariantMap& eventData)
 {
     int key = eventData["Key"].GetInt();
     int viewDirection = eventData["Qualifiers"].GetInt() == QUAL_CTRL ? -1 : 1;
@@ -1507,13 +1507,13 @@ void HandleHotKeysStandart ( VariantMap& eventData)
 
 void HandleKeyDown(StringHash eventType, VariantMap& eventData)
 {
-    if ( hotKeyMode == HOTKEYS_MODE_STANDARD)
+    if (hotKeyMode == HOTKEYS_MODE_STANDARD)
     {
-        HandleHotKeysStandart( eventData );
+        HandleHotKeysStandard(eventData);
     }
-    else if( hotKeyMode == HOTKEYS_MODE_BLENDER )
+    else if( hotKeyMode == HOTKEYS_MODE_BLENDER)
     {
-        HandleHotKeysBlender ( eventData );
+        HandleHotKeysBlender(eventData);
     }
 }
 
@@ -1815,9 +1815,9 @@ bool ColorWheelBuildMenuSelectTypeColor()
            
     if (coloringComponent.typeName == "Light") 
     {
-        actions.Push(CreateContextMenuItem("Light color", "HandleColorWheelMenu", "menuLightColor" ));
+        actions.Push(CreateContextMenuItem("Light color", "HandleColorWheelMenu", "menuLightColor"));
         actions.Push(CreateContextMenuItem("Specular intensity", "HandleColorWheelMenu", "menuSpecularIntensity"));
-        actions.Push(CreateContextMenuItem("Brightness multiplier", "HandleColorWheelMenu", "menuBrightnessMultiplier" ));
+        actions.Push(CreateContextMenuItem("Brightness multiplier", "HandleColorWheelMenu", "menuBrightnessMultiplier"));
         
         actions.Push(CreateContextMenuItem("Cancel", "HandleColorWheelMenu", "menuCancel"));
         

bin/Data/Scripts/Editor/EditorView.as

@@ -20,7 +20,7 @@ String renderPathName;
 bool mouseWheelCameraPosition = false;
 bool contextMenuActionWaitFrame = false;
 bool cameraFlyMode = true;
-int hotKeyMode = 0; // used for checking that kind of style manipulation user are prefer ( see HotKeysMode )
+int hotKeyMode = 0; // used for checking that kind of style manipulation user are prefer (see HotKeysMode)
 Vector3 lastSelectedNodesCenterPoint = Vector3(0,0,0); // for Blender mode to avoid own origin rotation when no nodes are selected. preserve last center for this
 WeakHandle lastSelectedNode = null;
 WeakHandle lastSelectedDrawable = null;
@@ -1231,9 +1231,9 @@ void UpdateView(float timeStep)
     if (input.keyDown[KEY_LSHIFT])
         speedMultiplier = cameraShiftSpeedMultiplier;
     
-    if (!input.keyDown[KEY_LCTRL])
-    {        
-        if (hotKeyMode == HOTKEYS_MODE_STANDARD ||  (hotKeyMode == HOTKEYS_MODE_BLENDER && cameraFlyMode && !input.keyDown[KEY_LSHIFT])) 
+    if (!input.keyDown[KEY_LCTRL] && !input.keyDown[KEY_LALT])
+    {
+        if (hotKeyMode == HOTKEYS_MODE_STANDARD || (hotKeyMode == HOTKEYS_MODE_BLENDER && cameraFlyMode && !input.keyDown[KEY_LSHIFT])) 
         {
             if (input.keyDown['W'] || input.keyDown[KEY_UP])
             {