Cycles: replace surface/volume sockets in output nodes with a single shader socket,

decided it's better to render objects as either surface or volume.

This may break the volume rendering patch, but shaders with volume closures still
get tagged as having volume closures, so it should be fixable without too many
changes.

1 files changed, 3 insertions, 4 deletions

diff --git a/intern/cycles/render/shader.h b/intern/cycles/render/shader.h
index 45efa123ef6..17ffc75924b 100644
--- a/intern/cycles/render/shader.h
+++ b/intern/cycles/render/shader.h
@@ -39,8 +39,8 @@ struct float3;
 
 /* Shader describing the appearance of a Mesh, Light or Background.
  *
- * While there is only a single shader graph, it has three outputs: surface,
- * volume and displacement, that the shader manager will compile and execute
+ * While there is only a single shader graph, it has two outputs: shader,
+ * displacement, that the shader manager will compile and execute
  * separately. */
 
 class Shader {
@@ -65,11 +65,10 @@ public:
 	bool need_update_attributes;
 
 	/* information about shader after compiling */
-	bool has_surface;
 	bool has_surface_emission;
 	bool has_surface_transparent;
-	bool has_volume;
 	bool has_displacement;
+	bool has_volume;
 
 	/* requested mesh attributes */
 	AttributeRequestSet attributes;