[Bf-blender-cvs] [d9aefc6b453] tracking_proportional_editing: Tracking: Tweak order of pivot and proportional editing

Sergey Sharybin noreply at git.blender.org
Tue Jan 5 10:47:49 CET 2021


Commit: d9aefc6b453b0f3e45675ef26bb9fa4dabd18e9c
Author: Sergey Sharybin
Date:   Tue Jan 5 10:47:12 2021 +0100
Branches: tracking_proportional_editing
https://developer.blender.org/rBd9aefc6b453b0f3e45675ef26bb9fa4dabd18e9c

Tracking: Tweak order of pivot and proportional editing

Matches other editors. Was a mistake in the original code.

Patch by Sebastian Koenig, thanks!

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

M	release/scripts/startup/bl_ui/space_clip.py

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

diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py
index a0a67ba084d..3f8599552e7 100644
--- a/release/scripts/startup/bl_ui/space_clip.py
+++ b/release/scripts/startup/bl_ui/space_clip.py
@@ -207,10 +207,6 @@ class CLIP_HT_header(Header):
 
                 row = layout.row()
                 row.prop(sc, "pivot_point", text="", icon_only=True)
-                row = layout.row(align=True)
-                icon = 'LOCKED' if sc.lock_selection else 'UNLOCKED'
-                row.prop(sc, "lock_selection", icon=icon, text="")
-                row.popover(panel='CLIP_PT_display')
 
                 # Proportional Editing
                 row = layout.row(align=True)
@@ -230,6 +226,11 @@ class CLIP_HT_header(Header):
                     panel="CLIP_PT_proportional_edit",
                 )
 
+                row = layout.row(align=True)
+                icon = 'LOCKED' if sc.lock_selection else 'UNLOCKED'
+                row.prop(sc, "lock_selection", icon=icon, text="")
+                row.popover(panel='CLIP_PT_display')
+
             elif sc.view == 'GRAPH':
                 row = layout.row(align=True)
                 row.prop(sc, "show_graph_only_selected", text="")



More information about the Bf-blender-cvs mailing list