Cycles: svn merge -r41205:41225 ^/trunk/blender
[blender.git] / release / scripts / startup / bl_ui / space_view3d.py
index 1170bce2c14323e873e8a7d5e9601b916ad05a59..bd5750a3a207eff3817cde7726764d1cd624a7c9 100644 (file)
@@ -2142,10 +2142,11 @@ class VIEW3D_PT_view3d_display(Panel):
         subsub.active = scene.unit_settings.system == 'NONE'
         subsub.prop(view, "grid_subdivisions", text="Subdivisions")
 
-        col = layout.column()
-        col.label(text="Shading:")
-        col.prop(gs, "material_mode", text="")
-        col.prop(view, "show_textured_solid")
+        if not scene.render.use_shading_nodes:
+            col = layout.column()
+            col.label(text="Shading:")
+            col.prop(gs, "material_mode", text="")
+            col.prop(view, "show_textured_solid")
 
         layout.separator()