diff options
author | Thomas Dinges <blender@dingto.org> | 2012-02-25 23:49:23 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2012-02-25 23:49:23 +0400 |
commit | 4f4bba39fb0da31bb4adad7e5110f98f85e59ebe (patch) | |
tree | f599202f5c43042088fd9933d938d4057f744960 /release | |
parent | 55e68985e7cf868481d3ffcb845f94e3c52a5043 (diff) |
Patch [#30341] by Davis Sorenson (dsavi). Thanks!
* Now the 3D view header displays value changes, when changing a value in the Object Special value (w-key).
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/startup/bl_operators/wm.py | 9 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 16 |
2 files changed, 25 insertions, 0 deletions
diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py index 61840829900..da078f925a9 100644 --- a/release/scripts/startup/bl_operators/wm.py +++ b/release/scripts/startup/bl_operators/wm.py @@ -644,6 +644,10 @@ class WM_OT_context_modal_mouse(Operator): data_path_iter = data_path_iter data_path_item = data_path_item + header_text = StringProperty( + name="Header Text", + description="Text to display in header during scale", + ) input_scale = FloatProperty( description="Scale the mouse movement by this value before applying the delta", @@ -703,14 +707,19 @@ class WM_OT_context_modal_mouse(Operator): if event_type == 'MOUSEMOVE': delta = event.mouse_x - self.initial_x self._values_delta(delta) + if self.header_text: + for item, value_orig in self._values.items(): + context.area.header_text_set(self.header_text % eval("item.%s" % self.data_path_item)) elif 'LEFTMOUSE' == event_type: item = next(iter(self._values.keys())) self._values_clear() + context.area.header_text_set() return operator_value_undo_return(item) elif event_type in {'RIGHTMOUSE', 'ESC'}: self._values_restore() + context.area.header_text_set() return {'CANCELLED'} return {'RUNNING_MODAL'} diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index bedd5a731fe..7e52d37c06e 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -791,11 +791,17 @@ class VIEW3D_MT_object_specials(Menu): props.data_path_iter = "selected_editable_objects" props.data_path_item = "data.lens" props.input_scale = 0.1 + if obj.data.lens_unit == 'MILLIMETERS': + props.header_text = "Camera Lens Angle: %.1fmm" + else: + props.header_text = "Camera Lens Angle: %.1f\u00B0" + else: props = layout.operator("wm.context_modal_mouse", text="Camera Lens Scale") props.data_path_iter = "selected_editable_objects" props.data_path_item = "data.ortho_scale" props.input_scale = 0.01 + props.header_text = "Camera Lens Scale: %.3f" if not obj.data.dof_object: #layout.label(text="Test Has DOF obj"); @@ -803,6 +809,7 @@ class VIEW3D_MT_object_specials(Menu): props.data_path_iter = "selected_editable_objects" props.data_path_item = "data.dof_distance" props.input_scale = 0.02 + props.header_text = "DOF Distance: %.3f" if obj.type in {'CURVE', 'FONT'}: layout.operator_context = 'INVOKE_REGION_WIN' @@ -811,11 +818,13 @@ class VIEW3D_MT_object_specials(Menu): props.data_path_iter = "selected_editable_objects" props.data_path_item = "data.extrude" props.input_scale = 0.01 + props.header_text = "Extrude Size: %.3f" props = layout.operator("wm.context_modal_mouse", text="Width Size") props.data_path_iter = "selected_editable_objects" props.data_path_item = "data.offset" props.input_scale = 0.01 + props.header_text = "Width Size: %.3f" if obj.type == 'EMPTY': layout.operator_context = 'INVOKE_REGION_WIN' @@ -824,6 +833,7 @@ class VIEW3D_MT_object_specials(Menu): props.data_path_iter = "selected_editable_objects" props.data_path_item = "empty_draw_size" props.input_scale = 0.01 + props.header_text = "Empty Draw Size: %.3f" if obj.type == 'LAMP': layout.operator_context = 'INVOKE_REGION_WIN' @@ -831,12 +841,14 @@ class VIEW3D_MT_object_specials(Menu): 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'}: 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': layout.separator() @@ -844,21 +856,25 @@ class VIEW3D_MT_object_specials(Menu): props.data_path_iter = "selected_editable_objects" props.data_path_item = "data.spot_size" props.input_scale = 0.01 + props.header_text = "Spot Size: %.2f" props = layout.operator("wm.context_modal_mouse", text="Spot Blend") props.data_path_iter = "selected_editable_objects" props.data_path_item = "data.spot_blend" props.input_scale = -0.01 + props.header_text = "Spot Blend: %.2f" props = layout.operator("wm.context_modal_mouse", text="Clip Start") props.data_path_iter = "selected_editable_objects" props.data_path_item = "data.shadow_buffer_clip_start" props.input_scale = 0.05 + props.header_text = "Clip Start: %.2f" props = layout.operator("wm.context_modal_mouse", text="Clip End") props.data_path_iter = "selected_editable_objects" props.data_path_item = "data.shadow_buffer_clip_end" props.input_scale = 0.05 + props.header_text = "Clip End: %.2f" layout.separator() |