[Bf-blender-cvs] [32ae3abbab2] master: Fix T59768: UV context menu showing in image editor.

Brecht Van Lommel noreply at git.blender.org
Fri Jan 4 13:49:12 CET 2019


Commit: 32ae3abbab266fb4bccdad2568fd5ec2cc28b843
Author: Brecht Van Lommel
Date:   Fri Jan 4 13:47:50 2019 +0100
Branches: master
https://developer.blender.org/rB32ae3abbab266fb4bccdad2568fd5ec2cc28b843

Fix T59768: UV context menu showing in image editor.

===================================================================

M	release/scripts/presets/keyconfig/keymap_data/blender_default.py
M	release/scripts/startup/bl_ui/space_image.py

===================================================================

diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index bb7b8480d9c..30d2f2ee862 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -767,6 +767,7 @@ def km_uv_editor(params):
          {"properties": [("data_path", 'tool_settings.use_snap')]}),
         ("wm.context_menu_enum", {"type": 'TAB', "value": 'PRESS', "shift": True, "ctrl": True},
          {"properties": [("data_path", 'tool_settings.snap_uv_element')]}),
+        op_menu("IMAGE_MT_uvs_specials", params.context_menu_event),
     ])
 
     # 3D cursor
@@ -1411,7 +1412,6 @@ def km_image_generic(params):
         ("image.save_as", {"type": 'S', "value": 'PRESS', "shift": True}, None),
         ("image.properties", {"type": 'N', "value": 'PRESS'}, None),
         ("image.toolshelf", {"type": 'T', "value": 'PRESS'}, None),
-        op_menu("IMAGE_MT_specials", params.context_menu_event),
         ("image.cycle_render_slot", {"type": 'J', "value": 'PRESS'}, None),
         ("image.cycle_render_slot", {"type": 'J', "value": 'PRESS', "alt": True},
          {"properties": [("reverse", True)]}),
diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py
index 69f319b4e03..f3f49d82714 100644
--- a/release/scripts/startup/bl_ui/space_image.py
+++ b/release/scripts/startup/bl_ui/space_image.py
@@ -438,7 +438,7 @@ class IMAGE_MT_uvs_select_mode(Menu):
             props.data_path = "tool_settings.uv_select_mode"
 
 
-class IMAGE_MT_specials(Menu):
+class IMAGE_MT_uvs_specials(Menu):
     bl_label = "UV Context Menu"
 
     def draw(self, context):
@@ -1325,7 +1325,7 @@ classes = (
     IMAGE_MT_uvs_mirror,
     IMAGE_MT_uvs_weldalign,
     IMAGE_MT_uvs_select_mode,
-    IMAGE_MT_specials,
+    IMAGE_MT_uvs_specials,
     IMAGE_MT_pivot_pie,
     IMAGE_MT_uvs_snap_pie,
     IMAGE_HT_header,



More information about the Bf-blender-cvs mailing list