[Bf-blender-cvs] [b83e559956d] soc-2020-custom-menus: Revert "Custom Menus: Add Pie menu"
TempoDev
noreply at git.blender.org
Tue Jun 30 14:13:52 CEST 2020
Commit: b83e559956d559a6f01e6cd7a978b5e24b218583
Author: TempoDev
Date: Tue Jun 30 14:04:20 2020 +0200
Branches: soc-2020-custom-menus
https://developer.blender.org/rBb83e559956d559a6f01e6cd7a978b5e24b218583
Revert "Custom Menus: Add Pie menu"
This reverts commit fe0e9900d5811a2d4d018ec24fedc139d21d9de6.
===================================================================
M release/datafiles/locale
M release/scripts/addons
M release/scripts/addons_contrib
M release/scripts/modules/rna_user_menus_ui.py
M release/scripts/startup/bl_ui/space_userpref.py
M source/blender/makesdna/DNA_userdef_types.h
M source/blender/makesrna/intern/rna_userdef.c
===================================================================
diff --git a/release/datafiles/locale b/release/datafiles/locale
index a6b1e6365f5..caf68fed42f 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit a6b1e6365f57a83b323cf781e50ada3fa1b3f73f
+Subproject commit caf68fed42f55e606b14c7105f5df694957ce036
diff --git a/release/scripts/addons b/release/scripts/addons
index 5d33d1a1c25..bc1262f4d61 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 5d33d1a1c2531e64bda78d46b517571f2b1e98e7
+Subproject commit bc1262f4d61feeba235bb75046e65e0e8411241f
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index 9468c406fb5..45aa940dabd 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit 9468c406fb554e32ff47b62bfef356b3908ec651
+Subproject commit 45aa940dabda64f7877c6d5dd843998a86f0a836
diff --git a/release/scripts/modules/rna_user_menus_ui.py b/release/scripts/modules/rna_user_menus_ui.py
index 7ab0d9060ec..f9878f90c8d 100644
--- a/release/scripts/modules/rna_user_menus_ui.py
+++ b/release/scripts/modules/rna_user_menus_ui.py
@@ -125,10 +125,6 @@ def draw_user_menus(context, layout):
layout.separator()
# TODO : set menu parameters in a submenu here
- pie_text = "List"
- if um.is_pie:
- pie_text = "Pie"
- rowsub.prop(um, "is_pie", text=pie_text, toggle=True)
col = layout.column()
row = layout.row()
@@ -137,14 +133,3 @@ def draw_user_menus(context, layout):
draw_item_editor(context=context, row=row)
layout.separator()
-
- km = bpy.context.window_manager.keyconfigs.user.keymaps['Window']
- for kmi in km.keymap_items:
- if kmi.idname == "wm.call_menu":
- if um.is_pie and kmi.properties.name == "SCREEN_MT_user_menu":
- kmi.idname = "wm.call_menu_pie"
- kmi.properties.name = "PIE_MT_user_menu"
- if kmi.idname == "wm.call_menu_pie":
- if kmi.properties.name == "PIE_MT_user_menu" and not um.is_pie:
- kmi.idname = "wm.call_menu"
- kmi.properties.name = "SCREEN_MT_user_menu"
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index 8342e21d116..4701c20f264 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -45,8 +45,7 @@ class USERPREF_HT_header(Header):
# Show '*' to let users know the preferences have been modified.
layout.operator(
"wm.save_userpref",
- text="Save Preferences{:s}".format(
- " *" if prefs.is_dirty else ""),
+ text="Save Preferences{:s}".format(" *" if prefs.is_dirty else ""),
)
def draw(self, context):
@@ -121,12 +120,10 @@ class USERPREF_MT_save_load(Menu):
layout.operator("wm.save_userpref", text="Save Preferences")
sub_revert = layout.column(align=True)
sub_revert.active = prefs.is_dirty
- sub_revert.operator("wm.read_userpref",
- text="Revert to Saved Preferences")
+ sub_revert.operator("wm.read_userpref", text="Revert to Saved Preferences")
layout.operator_context = 'INVOKE_AREA'
- layout.operator("wm.read_factory_userpref",
- text="Load Factory Preferences")
+ layout.operator("wm.read_factory_userpref", text="Load Factory Preferences")
class USERPREF_PT_save_preferences(Panel):
@@ -223,8 +220,7 @@ class USERPREF_PT_interface_text(InterfacePanel, CenterAlignMixIn, Panel):
prefs = context.preferences
view = prefs.view
- flow = layout.grid_flow(
- row_major=False, columns=0, even_columns=True, even_rows=False, align=False)
+ flow = layout.grid_flow(row_major=False, columns=0, even_columns=True, even_rows=False, align=False)
flow.prop(view, "use_text_antialiasing", text="Anti-Aliasing")
sub = flow.column()
@@ -311,8 +307,7 @@ class USERPREF_PT_interface_menus_mouse_over(InterfacePanel, CenterAlignMixIn, P
layout.active = view.use_mouse_over_open
- flow = layout.grid_flow(
- row_major=False, columns=0, even_columns=True, even_rows=False, align=False)
+ flow = layout.grid_flow(row_major=False, columns=0, even_columns=True, even_rows=False, align=False)
flow.prop(view, "open_toplevel_delay", text="Top Level")
flow.prop(view, "open_sublevel_delay", text="Sub Level")
@@ -326,8 +321,7 @@ class USERPREF_PT_interface_menus_pie(InterfacePanel, CenterAlignMixIn, Panel):
prefs = context.preferences
view = prefs.view
- flow = layout.grid_flow(
- row_major=False, columns=0, even_columns=True, even_rows=False, align=False)
+ flow = layout.grid_flow(row_major=False, columns=0, even_columns=True, even_rows=False, align=False)
flow.prop(view, "pie_animation_timeout")
flow.prop(view, "pie_tap_timeout")
@@ -361,14 +355,12 @@ class USERPREF_PT_edit_objects_new(EditingPanel, CenterAlignMixIn, Panel):
prefs = context.preferences
edit = prefs.edit
- flow = layout.grid_flow(
- row_major=False, columns=0, even_columns=True, even_rows=False, align=False)
+ flow = layout.grid_flow(row_major=False, columns=0, even_columns=True, even_rows=False, align=False)
flow.prop(edit, "material_link", text="Link Materials to")
flow.prop(edit, "object_align", text="Align to")
flow.prop(edit, "use_enter_edit_mode", text="Enter Edit Mode")
- flow.prop(edit, "collection_instance_empty_size",
- text="Instance Empty Size")
+ flow.prop(edit, "collection_instance_empty_size", text="Instance Empty Size")
class USERPREF_PT_edit_objects_duplicate_data(EditingPanel, CenterAlignMixIn, Panel):
@@ -381,8 +373,7 @@ class USERPREF_PT_edit_objects_duplicate_data(EditingPanel, CenterAlignMixIn, Pa
layout.use_property_split = False
- flow = layout.grid_flow(
- row_major=False, columns=0, even_columns=True, even_rows=False, align=True)
+ flow = layout.grid_flow(row_major=False, columns=0, even_columns=True, even_rows=False, align=True)
col = flow.column()
col.prop(edit, "use_duplicate_action", text="Action")
@@ -471,8 +462,7 @@ class USERPREF_PT_edit_misc(EditingPanel, CenterAlignMixIn, Panel):
edit = prefs.edit
col = layout.column()
- col.prop(edit, "sculpt_paint_overlay_color",
- text="Sculpt Overlay Color")
+ col.prop(edit, "sculpt_paint_overlay_color", text="Sculpt Overlay Color")
col.prop(edit, "node_margin", text="Node Auto-offset Margin")
@@ -518,8 +508,7 @@ class USERPREF_PT_animation_keyframes(AnimationPanel, CenterAlignMixIn, Panel):
col = layout.column(heading="Auto-Keyframing")
col.prop(edit, "use_auto_keying_warning", text="Show Warning")
- col.prop(edit, "use_keyframe_insert_available",
- text="Only Insert Available")
+ col.prop(edit, "use_keyframe_insert_available", text="Only Insert Available")
col.prop(edit, "use_auto_keying", text="Enable in New Scenes")
@@ -530,14 +519,11 @@ class USERPREF_PT_animation_fcurves(AnimationPanel, CenterAlignMixIn, Panel):
prefs = context.preferences
edit = prefs.edit
- flow = layout.grid_flow(
- row_major=False, columns=0, even_columns=True, even_rows=False, align=False)
+ flow = layout.grid_flow(row_major=False, columns=0, even_columns=True, even_rows=False, align=False)
flow.prop(edit, "fcurve_unselected_alpha", text="F-Curve Visibility")
- flow.prop(edit, "fcurve_new_auto_smoothing",
- text="Default Smoothing Mode")
- flow.prop(edit, "keyframe_new_interpolation_type",
- text="Default Interpolation")
+ flow.prop(edit, "fcurve_new_auto_smoothing", text="Default Smoothing Mode")
+ flow.prop(edit, "keyframe_new_interpolation_type", text="Default Interpolation")
flow.prop(edit, "keyframe_new_handle_type", text="Default Handles")
flow.prop(edit, "use_insertkey_xyz_to_rgb", text="XYZ to RGB")
@@ -561,8 +547,7 @@ class USERPREF_PT_system_sound(SystemPanel, CenterAlignMixIn, Panel):
layout.prop(system, "audio_device", expand=False)
- sub = layout.grid_flow(row_major=False, columns=0,
- even_columns=False, even_rows=False, align=False)
+ sub = layout.grid_flow(row_major=False, columns=0, even_columns=False, even_rows=False, align=False)
sub.active = system.audio_device not in {'NONE', 'Null'}
sub.prop(system, "audio_channels", text="Channels")
sub.prop(system, "audio_mixing_buffer", text="Mixing Buffer")
@@ -614,8 +599,7 @@ class USERPREF_PT_system_memory(SystemPanel, CenterAlignMixIn, Panel):
col = layout.column()
col.prop(system, "texture_time_out", text="Texture Time Out")
- col.prop(system, "texture_collection_rate",
- text="Garbage Collection Rate")
+ col.prop(system, "texture_collection_rate", text="Garbage Collection Rate")
layout.separator()
@@ -755,17 +739,13 @@ class USERPREF_PT_theme(ThemePanel, Panel):
split = layout.split(factor=0.6)
row = split.row(align=True)
- row.menu("USERPREF_MT_interface_theme_presets",
- text=USERPREF_MT_interface_theme_presets.bl_label)
+ row.menu("USERPREF_MT_interface_theme_presets", text=USERPREF_MT_interface_theme_presets.bl_label)
row.operator("wm.interface_theme_preset_add", text="", icon='ADD')
- row.operator("wm.interface_theme_preset_add", text="",
- icon='REMOVE').remove_active = True
+ row.operator("wm.interface_theme_preset_add", text="", icon='REMOVE').remove_active = True
row = split.row(align=True)
- row.operator("preferences.theme_install",
- text="Install...", icon='IMPORT')
- row.operator("pref
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list