[Bf-blender-cvs] [601ce87b1ad] soc-2020-outliner: Fix: Incorrect context menu after merge

Nathan Craddock noreply at git.blender.org
Tue Jul 28 05:38:51 CEST 2020


Commit: 601ce87b1add9d27c2d50504b7123d47ed9c38c0
Author: Nathan Craddock
Date:   Mon Jul 27 21:38:24 2020 -0600
Branches: soc-2020-outliner
https://developer.blender.org/rB601ce87b1add9d27c2d50504b7123d47ed9c38c0

Fix: Incorrect context menu after merge

Accidentally resolved merge conflicts wrong.

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

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

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

diff --git a/release/scripts/startup/bl_ui/space_outliner.py b/release/scripts/startup/bl_ui/space_outliner.py
index bc9b7d45c3d..fab639dd3ba 100644
--- a/release/scripts/startup/bl_ui/space_outliner.py
+++ b/release/scripts/startup/bl_ui/space_outliner.py
@@ -312,7 +312,7 @@ class OUTLINER_MT_object(Menu):
             layout.operator("outliner.id_operation", text="Unlink").type = 'UNLINK'
             layout.separator()
 
-        layout.operator("outliner.collection_new", text="New Collection").nested = True
+        layout.operator("outliner.collection_new", text="New Collection")
 
         layout.separator()



More information about the Bf-blender-cvs mailing list