diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2014-03-26 21:11:16 +0400 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2014-03-26 21:11:16 +0400 |
| commit | 8da4936590e6390bf401472f632928111f0b41da (patch) | |
| tree | 58e0287e4c2d6a55d49aac560d6ec64c91c285da /intern/cycles | |
| parent | af16d462e36850d11796e65a81a0d7c082126bd0 (diff) | |
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.
Diffstat (limited to 'intern/cycles')
| -rw-r--r-- | intern/cycles/app/cycles_standalone.cpp | 4 | ||||
| -rw-r--r-- | intern/cycles/render/buffers.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/intern/cycles/app/cycles_standalone.cpp b/intern/cycles/app/cycles_standalone.cpp index fdee92a5eb0..75ecb78b200 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 020add6526a..27ab20bbafd 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 |