diff options
Diffstat (limited to 'release/scripts/ui/properties_data_lamp.py')
| -rw-r--r-- | release/scripts/ui/properties_data_lamp.py | 38 |
1 files changed, 27 insertions, 11 deletions
diff --git a/release/scripts/ui/properties_data_lamp.py b/release/scripts/ui/properties_data_lamp.py index 9a99959a610..14493301b1e 100644 --- a/release/scripts/ui/properties_data_lamp.py +++ b/release/scripts/ui/properties_data_lamp.py @@ -20,13 +20,14 @@ import bpy from rna_prop_ui import PropertyPanel -narrowui = 180 +narrowui = bpy.context.user_preferences.view.properties_width_check class LAMP_MT_sunsky_presets(bpy.types.Menu): - bl_label = "Render Presets" + bl_label = "Sun & Sky Presets" preset_subdir = "sunsky" - preset_operator = "script.python_file_run" + preset_operator = "script.execute_preset" + COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} draw = bpy.types.Menu.draw_preset @@ -36,11 +37,13 @@ class DataButtonsPanel(bpy.types.Panel): bl_context = "data" def poll(self, context): - return context.lamp + engine = context.scene.render.engine + return context.lamp and (engine in self.COMPAT_ENGINES) class DATA_PT_preview(DataButtonsPanel): bl_label = "Preview" + COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} def draw(self, context): self.layout.template_preview(context.lamp) @@ -49,6 +52,7 @@ class DATA_PT_preview(DataButtonsPanel): class DATA_PT_context_lamp(DataButtonsPanel): bl_label = "" bl_show_header = False + COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} def draw(self, context): layout = self.layout @@ -75,10 +79,12 @@ class DATA_PT_context_lamp(DataButtonsPanel): class DATA_PT_custom_props_lamp(DataButtonsPanel, PropertyPanel): _context_path = "object.data" + COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} class DATA_PT_lamp(DataButtonsPanel): bl_label = "Lamp" + COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} def draw(self, context): layout = self.layout @@ -125,10 +131,12 @@ class DATA_PT_lamp(DataButtonsPanel): class DATA_PT_sunsky(DataButtonsPanel): bl_label = "Sky & Atmosphere" + COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} def poll(self, context): lamp = context.lamp - return (lamp and lamp.type == 'SUN') + engine = context.scene.render.engine + return (lamp and lamp.type == 'SUN') and (engine in self.COMPAT_ENGINES) def draw(self, context): layout = self.layout @@ -138,8 +146,8 @@ class DATA_PT_sunsky(DataButtonsPanel): row = layout.row(align=True) row.prop(lamp, "use_sky") - row.menu("LAMP_MT_sunsky_presets", text="Presets") - row.operator("lamp.sunsky_preset_add", text="Add") + row.menu("LAMP_MT_sunsky_presets", text=bpy.types.LAMP_MT_sunsky_presets.bl_label) + row.operator("lamp.sunsky_preset_add", text="", icon="ZOOMIN") row = layout.row() row.active = lamp.use_sky or lamp.use_atmosphere @@ -196,10 +204,12 @@ class DATA_PT_sunsky(DataButtonsPanel): class DATA_PT_shadow(DataButtonsPanel): bl_label = "Shadow" + COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} def poll(self, context): lamp = context.lamp - return (lamp and lamp.type in ('POINT', 'SUN', 'SPOT', 'AREA')) + engine = context.scene.render.engine + return (lamp and lamp.type in ('POINT', 'SUN', 'SPOT', 'AREA')) and (engine in self.COMPAT_ENGINES) def draw(self, context): layout = self.layout @@ -319,10 +329,12 @@ class DATA_PT_shadow(DataButtonsPanel): class DATA_PT_area(DataButtonsPanel): bl_label = "Area Shape" + COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} def poll(self, context): lamp = context.lamp - return (lamp and lamp.type == 'AREA') + engine = context.scene.render.engine + return (lamp and lamp.type == 'AREA') and (engine in self.COMPAT_ENGINES) def draw(self, context): layout = self.layout @@ -344,10 +356,12 @@ class DATA_PT_area(DataButtonsPanel): class DATA_PT_spot(DataButtonsPanel): bl_label = "Spot Shape" + COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} def poll(self, context): lamp = context.lamp - return (lamp and lamp.type == 'SPOT') + engine = context.scene.render.engine + return (lamp and lamp.type == 'SPOT') and (engine in self.COMPAT_ENGINES) def draw(self, context): layout = self.layout @@ -379,11 +393,13 @@ class DATA_PT_spot(DataButtonsPanel): class DATA_PT_falloff_curve(DataButtonsPanel): bl_label = "Falloff Curve" bl_default_closed = True + COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} def poll(self, context): lamp = context.lamp + engine = context.scene.render.engine - return (lamp and lamp.type in ('POINT', 'SPOT') and lamp.falloff_type == 'CUSTOM_CURVE') + return (lamp and lamp.type in ('POINT', 'SPOT') and lamp.falloff_type == 'CUSTOM_CURVE') and (engine in self.COMPAT_ENGINES) def draw(self, context): lamp = context.lamp |