[Bf-blender-cvs] [4f8bffa7bfe] blender2.8: Merge branch 'master' into blender2.8

[Brecht Van Lommel]

Commit: 4f8bffa7bfe46192b43c75d864e2117369cbffdd
Author: Brecht Van Lommel
Date:   Thu Nov 23 19:16:11 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB4f8bffa7bfe46192b43c75d864e2117369cbffdd

Merge branch 'master' into blender2.8

===================================================================



===================================================================

diff --cc release/scripts/startup/bl_ui/space_view3d.py
index d449dd20c3e,096c164d7d0..cd062a67647
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@@ -1551,21 -1548,23 +1551,24 @@@ class VIEW3D_MT_object_specials(Menu)
              lamp = obj.data
  
              layout.operator_context = 'INVOKE_REGION_WIN'
 +            use_shading_nodes = context.view_render.use_shading_nodes
  
 -            if scene.render.use_shading_nodes:
 +            if use_shading_nodes:
-                 try:
-                     value = lamp.node_tree.nodes["Emission"].inputs["Strength"].default_value
-                 except AttributeError:
-                     value = None
- 
-                 if value is not None:
+                 emission_node = None
+                 if lamp.node_tree:
+                     for node in lamp.node_tree.nodes:
+                         if getattr(node, "type", None) == 'EMISSION':
+                             emission_node = node
+                             break
+ 
+                 if emission_node is not None:
                      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.data_path_item = "data.node_tree" \
+                                            ".nodes[\"" + emission_node.name + "\"]" \
+                                            ".inputs[\"Strength\"].default_value"
                      props.header_text = "Lamp Strength: %.3f"
                      props.input_scale = 0.1
-                 del value
  
                  if lamp.type == 'AREA':
                      props = layout.operator("wm.context_modal_mouse", text="Size X")