[Bf-blender-cvs] [8da4936] master: Fix for build error in Cycles standalone caused by new DeviceDrawParams added in rB74518b28267e9b18199212fbaa3c689fa018d20c.

[Lukas Tönne]

Commit: 8da4936590e6390bf401472f632928111f0b41da
Author: Lukas Tönne
Date:   Wed Mar 26 18:11:16 2014 +0100
https://developer.blender.org/rB8da4936590e6390bf401472f632928111f0b41da

Fix for build error in Cycles standalone caused by new DeviceDrawParams
added in rB74518b28267e9b18199212fbaa3c689fa018d20c.

No special bind/unbind needed for standalone viewer, so can just use a
static stub in the display callback.

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

M	intern/cycles/app/cycles_standalone.cpp
M	intern/cycles/render/buffers.h

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

diff --git a/intern/cycles/app/cycles_standalone.cpp b/intern/cycles/app/cycles_standalone.cpp
index fdee92a..75ecb78 100644
--- a/intern/cycles/app/cycles_standalone.cpp
+++ b/intern/cycles/app/cycles_standalone.cpp
@@ -188,7 +188,9 @@ static void display_info(Progress& progress)
 
 static void display()
 {
-	options.session->draw(session_buffer_params());
+	static DeviceDrawParams draw_params = DeviceDrawParams();
+
+	options.session->draw(session_buffer_params(), draw_params);
 
 	display_info(options.session->progress);
 }
diff --git a/intern/cycles/render/buffers.h b/intern/cycles/render/buffers.h
index 020add6..27ab20b 100644
--- a/intern/cycles/render/buffers.h
+++ b/intern/cycles/render/buffers.h
@@ -31,7 +31,7 @@
 CCL_NAMESPACE_BEGIN
 
 class Device;
-class DeviceDrawParams;
+struct DeviceDrawParams;
 struct float4;
 
 /* Buffer Parameters