diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-03-30 13:06:20 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-03-30 13:06:45 +0300 |
| commit | 131912dc73ddb828a9e393845e12f6d1c4f5d76b (patch) | |
| tree | f75b01cf8077f31de8f0138ed43c4a3e800d1613 /intern/cycles/blender/blender_session.cpp | |
| parent | 09397ac2c16efd073090f3c553568f4315273fa4 (diff) | |
Cycles: Fix compilation error with MSVC after recent C++11 changes
Diffstat (limited to 'intern/cycles/blender/blender_session.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_session.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp index ee6ec7ac2c1..4f428bbea57 100644 --- a/intern/cycles/blender/blender_session.cpp +++ b/intern/cycles/blender/blender_session.cpp @@ -487,8 +487,8 @@ void BlenderSession::render() } /* clear callback */ - session->write_render_tile_cb = NULL; - session->update_render_tile_cb = NULL; + session->write_render_tile_cb = function_null; + session->update_render_tile_cb = function_null; /* free all memory used (host and device), so we wouldn't leave render * engine with extra memory allocated |