[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57265] trunk/blender/release/scripts/ startup/bl_ui/space_view3d.py: Fix #35644: lamp specials menu still showed blender internal energy and falloff
Brecht Van Lommel
brechtvanlommel at pandora.be
Thu Jun 6 13:18:39 CEST 2013
Revision: 57265
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57265
Author: blendix
Date: 2013-06-06 11:18:39 +0000 (Thu, 06 Jun 2013)
Log Message:
-----------
Fix #35644: lamp specials menu still showed blender internal energy and falloff
distance when cycles was selected as renderer.
Modified Paths:
--------------
trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
Modified: trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_view3d.py 2013-06-06 06:02:46 UTC (rev 57264)
+++ trunk/blender/release/scripts/startup/bl_ui/space_view3d.py 2013-06-06 11:18:39 UTC (rev 57265)
@@ -903,7 +903,9 @@
def draw(self, context):
layout = self.layout
+ scene = context.scene
obj = context.object
+
if obj.type == 'CAMERA':
layout.operator_context = 'INVOKE_REGION_WIN'
@@ -959,18 +961,24 @@
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.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")
+ 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.distance"
- props.input_scale = 0.1
- props.header_text = "Lamp Falloff Distance: %.1f"
+ 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'}:
+ 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()
props = layout.operator("wm.context_modal_mouse", text="Spot Size")
@@ -985,17 +993,18 @@
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"
+ if not scene.render.use_shading_nodes:
+ 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"
+ 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()
More information about the Bf-blender-cvs
mailing list