diff options
author | Thomas Dinges <blender@dingto.org> | 2013-06-11 01:16:29 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2013-06-11 01:16:29 +0400 |
commit | cae7c6da533a0f33c1e6ca0b278f5be285320eab (patch) | |
tree | 0f28690b2ee2c8bf7dc27420d9d820a94be60113 /release | |
parent | ad2509b20d95ccdce83fd17a63bf0e6af06e0ce4 (diff) | |
parent | c03e638cf310cde57ede10d3d9c90aecce007b15 (diff) |
SVN merge r57320-57365 into soc-2013-dingto
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/startup/bl_operators/view3d.py | 1 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_dopesheet.py | 2 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_info.py | 13 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 36 |
4 files changed, 46 insertions, 6 deletions
diff --git a/release/scripts/startup/bl_operators/view3d.py b/release/scripts/startup/bl_operators/view3d.py index 8c732432c2b..cfdb5dbe677 100644 --- a/release/scripts/startup/bl_operators/view3d.py +++ b/release/scripts/startup/bl_operators/view3d.py @@ -96,6 +96,7 @@ class VIEW3D_OT_select_or_deselect_all(Operator): "Select element under the mouse, deselect everything is there's nothing under the mouse" bl_label = "Select or Deselect All" bl_idname = "view3d.select_or_deselect_all" + bl_options = {'UNDO'} extend = BoolProperty( name="Extend", diff --git a/release/scripts/startup/bl_ui/space_dopesheet.py b/release/scripts/startup/bl_ui/space_dopesheet.py index 8a4529863a9..2b3be00e3c6 100644 --- a/release/scripts/startup/bl_ui/space_dopesheet.py +++ b/release/scripts/startup/bl_ui/space_dopesheet.py @@ -67,6 +67,8 @@ def dopesheet_filter(layout, context, genericFiltersOnly=False): row.prop(dopesheet, "show_meshes", text="") if bpy.data.shape_keys: row.prop(dopesheet, "show_shapekeys", text="") + if bpy.data.meshes: + row.prop(dopesheet, "show_modifiers", text="") if bpy.data.materials: row.prop(dopesheet, "show_materials", text="") if bpy.data.lamps: diff --git a/release/scripts/startup/bl_ui/space_info.py b/release/scripts/startup/bl_ui/space_info.py index 4ea366e3541..7487aaf420d 100644 --- a/release/scripts/startup/bl_ui/space_info.py +++ b/release/scripts/startup/bl_ui/space_info.py @@ -64,6 +64,19 @@ class INFO_HT_header(Header): layout.template_reports_banner() row = layout.row(align=True) + + if bpy.app.autoexec_fail is True and bpy.app.autoexec_fail_quiet is False: + layout.operator_context = 'EXEC_DEFAULT' + row.label("Script failed to auto-run", icon='ERROR') + if bpy.data.is_saved: + props = row.operator("wm.open_mainfile", icon='SCREEN_BACK', text="Reload Trusted") + props.filepath = bpy.data.filepath + props.use_scripts = True + + row.operator("script.autoexec_warn_clear", icon='CANCEL') + row.label("Skipping: (%s)" % bpy.app.autoexec_fail_message) + return + row.operator("wm.splash", text="", icon='BLENDER', emboss=False) row.label(text=scene.statistics(), translate=False) diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index e8531db3e23..c61b07800ca 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -959,27 +959,51 @@ class VIEW3D_MT_object_specials(Menu): props.header_text = "Empty Draw Size: %.3f" if obj.type == 'LAMP': + lamp = obj.data + layout.operator_context = 'INVOKE_REGION_WIN' if scene.render.use_shading_nodes: - props = layout.operator("wm.context_modal_mouse", text="Size") - props.data_path_iter = "selected_editable_objects" - props.data_path_item = "data.shadow_soft_size" - props.header_text = "Lamp Size: %.3f" + try: + value = lamp.node_tree.nodes["Emission"].inputs["Strength"].default_value + + props = layout.operator("wm.context_modal_mouse", text="Strength") + props.data_path_iter = "selected_editable_objects" + props.data_path_item = "data.node_tree.nodes[\"Emission\"].inputs[\"Strength\"].default_value" + props.header_text = "Lamp Strength: %.3f" + props.input_scale = 0.1 + except AttributeError: + pass + + if lamp.type == 'AREA' and lamp.shape == 'RECTANGLE': + props = layout.operator("wm.context_modal_mouse", text="Size X") + props.data_path_iter = "selected_editable_objects" + props.data_path_item = "data.size" + props.header_text = "Lamp Size X: %.3f" + + props = layout.operator("wm.context_modal_mouse", text="Size Y") + props.data_path_iter = "selected_editable_objects" + props.data_path_item = "data.size" + props.header_text = "Lamp Size Y: %.3f" + elif lamp.type in {'SPOT', 'AREA', 'POINT', 'SUN'}: + props = layout.operator("wm.context_modal_mouse", text="Size") + props.data_path_iter = "selected_editable_objects" + props.data_path_item = "data.shadow_soft_size" + props.header_text = "Lamp Size: %.3f" else: props = layout.operator("wm.context_modal_mouse", text="Energy") props.data_path_iter = "selected_editable_objects" props.data_path_item = "data.energy" props.header_text = "Lamp Energy: %.3f" - if obj.data.type in {'SPOT', 'AREA', 'POINT'}: + if lamp.type in {'SPOT', 'AREA', 'POINT'}: props = layout.operator("wm.context_modal_mouse", text="Falloff Distance") props.data_path_iter = "selected_editable_objects" props.data_path_item = "data.distance" props.input_scale = 0.1 props.header_text = "Lamp Falloff Distance: %.1f" - if obj.data.type == 'SPOT': + if lamp.type == 'SPOT': layout.separator() props = layout.operator("wm.context_modal_mouse", text="Spot Size") props.data_path_iter = "selected_editable_objects" |