[Bf-blender-cvs] [e2b60f858e0] master: UI: Reinstate icons in the Physics Properties

William Reynish noreply at git.blender.org
Sun May 12 19:57:58 CEST 2019


Commit: e2b60f858e0a3d96aa2914e5bfbf78cf3c887c74
Author: William Reynish
Date:   Sun May 12 19:57:56 2019 +0200
Branches: master
https://developer.blender.org/rBe2b60f858e0a3d96aa2914e5bfbf78cf3c887c74

UI: Reinstate icons in the Physics Properties

These were removed at a time when there were no modifier icons.

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

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

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

diff --git a/release/scripts/startup/bl_ui/properties_physics_common.py b/release/scripts/startup/bl_ui/properties_physics_common.py
index aeeb4714d46..70e745b1c20 100644
--- a/release/scripts/startup/bl_ui/properties_physics_common.py
+++ b/release/scripts/startup/bl_ui/properties_physics_common.py
@@ -35,7 +35,7 @@ class PhysicButtonsPanel:
         return (context.object) and context.engine in cls.COMPAT_ENGINES
 
 
-def physics_add(layout, md, name, type, _typeicon, toggles):
+def physics_add(layout, md, name, type, typeicon, toggles):
     row = layout.row(align=True)
     if md:
         row.context_pointer_set("modifier", md)
@@ -53,16 +53,16 @@ def physics_add(layout, md, name, type, _typeicon, toggles):
             "object.modifier_add",
             text=name,
             text_ctxt=i18n_contexts.default,
-            icon='BLANK1',
+            icon=typeicon,
         ).type = type
 
 
-def physics_add_special(layout, data, name, addop, removeop, _typeicon):
+def physics_add_special(layout, data, name, addop, removeop, typeicon):
     row = layout.row(align=True)
     if data:
         row.operator(removeop, text=name, text_ctxt=i18n_contexts.default, icon='X')
     else:
-        row.operator(addop, text=name, text_ctxt=i18n_contexts.default, icon='BLANK1')
+        row.operator(addop, text=name, text_ctxt=i18n_contexts.default, icon=typeicon)
 
 
 class PHYSICS_PT_add(PhysicButtonsPanel, Panel):
@@ -84,7 +84,7 @@ class PHYSICS_PT_add(PhysicButtonsPanel, Panel):
         col = flow.column()
 
         if obj.field.type == 'NONE':
-            col.operator("object.forcefield_toggle", text="Force Field", icon='BLANK1')
+            col.operator("object.forcefield_toggle", text="Force Field", icon='FORCE_FORCE')
         else:
             col.operator("object.forcefield_toggle", text="Force Field", icon='X')



More information about the Bf-blender-cvs mailing list