1 files changed, 26 insertions, 54 deletions

diff --git a/release/scripts/ui/properties_data_metaball.py b/release/scripts/ui/properties_data_metaball.py
index e0155059b98..a6b1bb75cbe 100644
--- a/release/scripts/ui/properties_data_metaball.py
+++ b/release/scripts/ui/properties_data_metaball.py
@@ -20,19 +20,18 @@
 import bpy
 from rna_prop_ui import PropertyPanel
 
-narrowui = bpy.context.user_preferences.view.properties_width_check
 
-
-class DataButtonsPanel(bpy.types.Panel):
+class DataButtonsPanel():
     bl_space_type = 'PROPERTIES'
     bl_region_type = 'WINDOW'
     bl_context = "data"
 
-    def poll(self, context):
+    @classmethod
+    def poll(cls, context):
         return context.meta_ball
 
 
-class DATA_PT_context_metaball(DataButtonsPanel):
+class DATA_PT_context_metaball(DataButtonsPanel, bpy.types.Panel):
     bl_label = ""
     bl_show_header = False
 
@@ -42,35 +41,28 @@ class DATA_PT_context_metaball(DataButtonsPanel):
         ob = context.object
         mball = context.meta_ball
         space = context.space_data
-        wide_ui = context.region.width > narrowui
-
-        if wide_ui:
-            split = layout.split(percentage=0.65)
-            if ob:
-                split.template_ID(ob, "data")
-                split.separator()
-            elif mball:
-                split.template_ID(space, "pin_id")
-                split.separator()
-        else:
-            if ob:
-                layout.template_ID(ob, "data")
-            elif mball:
-                layout.template_ID(space, "pin_id")
-
-
-class DATA_PT_custom_props_metaball(DataButtonsPanel, PropertyPanel):
+
+        split = layout.split(percentage=0.65)
+        if ob:
+            split.template_ID(ob, "data")
+            split.separator()
+        elif mball:
+            split.template_ID(space, "pin_id")
+            split.separator()
+
+
+class DATA_PT_custom_props_metaball(DataButtonsPanel, PropertyPanel, bpy.types.Panel):
+    COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
     _context_path = "object.data"
 
 
-class DATA_PT_metaball(DataButtonsPanel):
+class DATA_PT_metaball(DataButtonsPanel, bpy.types.Panel):
     bl_label = "Metaball"
 
     def draw(self, context):
         layout = self.layout
 
         mball = context.meta_ball
-        wide_ui = context.region.width > narrowui
 
         split = layout.split()
 
@@ -80,34 +72,27 @@ class DATA_PT_metaball(DataButtonsPanel):
         sub.prop(mball, "wire_size", text="View")
         sub.prop(mball, "render_size", text="Render")
 
-        if wide_ui:
-            col = split.column()
+        col = split.column()
         col.label(text="Settings:")
         col.prop(mball, "threshold", text="Threshold")
 
         layout.label(text="Update:")
-        if wide_ui:
-            layout.prop(mball, "flag", expand=True)
-        else:
-            layout.prop(mball, "flag", text="")
+        layout.prop(mball, "flag", expand=True)
 
 
-class DATA_PT_metaball_element(DataButtonsPanel):
+class DATA_PT_metaball_element(DataButtonsPanel, bpy.types.Panel):
     bl_label = "Active Element"
 
-    def poll(self, context):
+    @classmethod
+    def poll(cls, context):
         return (context.meta_ball and context.meta_ball.active_element)
 
     def draw(self, context):
         layout = self.layout
 
         metaelem = context.meta_ball.active_element
-        wide_ui = context.region.width > narrowui
 
-        if wide_ui:
-            layout.prop(metaelem, "type")
-        else:
-            layout.prop(metaelem, "type", text="")
+        layout.prop(metaelem, "type")
 
         split = layout.split()
 
@@ -117,8 +102,7 @@ class DATA_PT_metaball_element(DataButtonsPanel):
         col.prop(metaelem, "negative", text="Negative")
         col.prop(metaelem, "hide", text="Hide")
 
-        if wide_ui:
-            col = split.column(align=True)
+        col = split.column(align=True)
 
         if metaelem.type in ('CUBE', 'ELLIPSOID'):
             col.label(text="Size:")
@@ -136,24 +120,12 @@ class DATA_PT_metaball_element(DataButtonsPanel):
             col.prop(metaelem, "size_y", text="Y")
 
 
-classes = [
-    DATA_PT_context_metaball,
-    DATA_PT_metaball,
-    DATA_PT_metaball_element,
-
-    DATA_PT_custom_props_metaball]
-
-
 def register():
-    register = bpy.types.register
-    for cls in classes:
-        register(cls)
+    pass
 
 
 def unregister():
-    unregister = bpy.types.unregister
-    for cls in classes:
-        unregister(cls)
+    pass
 
 if __name__ == "__main__":
     register()