Patch by Oenvoyage: Lamp specials menu was context insensitive,

displaying lamp properties regardless of type hence causing errors. Now
active object controls what properties to display. Still it's possible to
manage multiple mixed lamps types at once. Also added useful items for
cameras and empties

1 files changed, 61 insertions, 13 deletions

diff --git a/release/scripts/ui/space_view3d.py b/release/scripts/ui/space_view3d.py
index d4ac6b1eae0..19140a9e79d 100644
--- a/release/scripts/ui/space_view3d.py
+++ b/release/scripts/ui/space_view3d.py
@@ -717,30 +717,78 @@ class VIEW3D_MT_object_specials(bpy.types.Menu):
         layout = self.layout
 
         obj = context.object
-        if obj.type == 'LAMP':
+        if obj.type == 'CAMERA':
+            layout.operator_context = 'INVOKE_REGION_WIN'
+
+            props = layout.operator("wm.context_modal_mouse", text="Camera Lens Angle")
+            props.data_path_iter = "selected_editable_objects"
+            props.data_path_item = "data.lens"
+            props.input_scale = 0.1
+
+            if not obj.data.dof_object:
+                #layout.label(text="Test Has DOF obj");
+                props = layout.operator("wm.context_modal_mouse", text="DOF Distance")
+                props.data_path_iter = "selected_editable_objects"
+                props.data_path_item = "data.dof_distance"
+                props.input_scale = 0.02
+
+        if obj.type in ['CURVE','TEXT']:
             layout.operator_context = 'INVOKE_REGION_WIN'
 
-            props = layout.operator("wm.context_modal_mouse", text="Spot Size")
+            props = layout.operator("wm.context_modal_mouse", text="Extrude Size")
             props.data_path_iter = "selected_editable_objects"
-            props.data_path_item = "data.spot_size"
+            props.data_path_item = "data.extrude"
             props.input_scale = 0.01
 
-            props = layout.operator("wm.context_modal_mouse", text="Distance")
+            props = layout.operator("wm.context_modal_mouse", text="Width Size")
             props.data_path_iter = "selected_editable_objects"
-            props.data_path_item = "data.distance"
-            props.input_scale = 0.1
+            props.data_path_item = "data.width"
+            props.input_scale = 0.01
 
-            props = layout.operator("wm.context_modal_mouse", text="Clip Start")
+        if obj.type == 'EMPTY':
+            layout.operator_context = 'INVOKE_REGION_WIN'
+
+            props = layout.operator("wm.context_modal_mouse", text="Empty Draw Size")
             props.data_path_iter = "selected_editable_objects"
-            props.data_path_item = "data.shadow_buffer_clip_start"
-            props.input_scale = 0.05
+            props.data_path_item = "empty_draw_size"
+            props.input_scale = 0.01
 
-            props = layout.operator("wm.context_modal_mouse", text="Clip End")
+        if obj.type == 'LAMP':
+            layout.operator_context = 'INVOKE_REGION_WIN'
+
+            props = layout.operator("wm.context_modal_mouse", text="Energy")
             props.data_path_iter = "selected_editable_objects"
-            props.data_path_item = "data.shadow_buffer_clip_end"
-            props.input_scale = 0.05
+            props.data_path_item = "data.energy"
 
-            layout.separator()
+            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
+
+            if obj.data.type == 'SPOT':
+                layout.separator()
+                props = layout.operator("wm.context_modal_mouse", text="Spot Size")
+                props.data_path_iter = "selected_editable_objects"
+                props.data_path_item = "data.spot_size"
+                props.input_scale = 0.01
+
+                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 = 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 = 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
+
+        layout.separator()
 
         props = layout.operator("object.isolate_type_render")