[Bf-blender-cvs] [75980f4af2a] blender2.8: Revert "Cleanup: use tuples in python according to feedback"

Campbell Barton noreply at git.blender.org
Mon Sep 17 00:50:01 CEST 2018


Commit: 75980f4af2ab85047165b8971adec799b845cbab
Author: Campbell Barton
Date:   Mon Sep 17 09:00:46 2018 +1000
Branches: blender2.8
https://developer.blender.org/rB75980f4af2ab85047165b8971adec799b845cbab

Revert "Cleanup: use tuples in python according to feedback"

This reverts commit b1f0e4c2d673320085cd5e1c68f4f5f814bacede.

Sets are typically preferred for __contains__ checks
when order doesn't matter.

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

M	release/scripts/addons
M	release/scripts/startup/bl_ui/space_node.py

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

diff --git a/release/scripts/addons b/release/scripts/addons
index d5ad293372d..5f7fba0565a 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit d5ad293372d3a66ea52ec9d307104e3cd62d3cb6
+Subproject commit 5f7fba0565a7c9ae93eae31a08fc9bbbd16d333a
diff --git a/release/scripts/startup/bl_ui/space_node.py b/release/scripts/startup/bl_ui/space_node.py
index 7fa6d106fb9..4dff94019ab 100644
--- a/release/scripts/startup/bl_ui/space_node.py
+++ b/release/scripts/startup/bl_ui/space_node.py
@@ -63,7 +63,7 @@ class NODE_HT_header(Header):
                 layout.separator_spacer()
 
                 row = layout.row()
-                types_that_support_material = ('MESH', 'CURVE', 'SURFACE', 'FONT', 'META', 'GPENCIL')
+                types_that_support_material = {'MESH', 'CURVE', 'SURFACE', 'FONT', 'META', 'GPENCIL'}
                 # disable material slot buttons when pinned, cannot find correct slot within id_from (#36589)
                 # disable also when the selected object does not support materials
                 row.enabled = not snode.pin and ob.type in types_that_support_material



More information about the Bf-blender-cvs mailing list