[Bf-blender-cvs] [8fcc04edce5] blender2.8: Cleanup: avoid using instance to get enum

Campbell Barton noreply at git.blender.org
Mon Nov 5 05:35:44 CET 2018


Commit: 8fcc04edce53c5b3b01bf392e1667878ebcce0ef
Author: Campbell Barton
Date:   Mon Nov 5 13:54:43 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB8fcc04edce53c5b3b01bf392e1667878ebcce0ef

Cleanup: avoid using instance to get enum

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

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

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

diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index 48284f89d59..c494aae03cd 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -95,11 +95,11 @@ def generate_from_brushes_tool_slots_ex(
 def generate_from_enum_ex(
         context, *,
         icon_prefix,
-        data,
+        type,
         attr,
 ):
     tool_defs = []
-    for enum in data.rna_type.properties[attr].enum_items_static:
+    for enum in type.bl_rna.properties[attr].enum_items_static:
         name = enum.name
         identifier = enum.identifier
         tool_defs.append(
@@ -1006,7 +1006,7 @@ class _defs_particle:
         return generate_from_enum_ex(
             context,
             icon_prefix="brush.particle.",
-            data=context.tool_settings.particle_edit,
+            type=bpy.types.ParticleEdit,
             attr="tool",
         )



More information about the Bf-blender-cvs mailing list