Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles: Fix compilation error with MSVC after recent C++11 changes

Browse Source
This commit is contained in:
Sergey Sharybin
2015-03-30 15:06:20 +05:00
parent 09397ac2c1
commit 131912dc73
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/blender/blender_session.cpp
View File

@@ -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

6
intern/cycles/util/util_function.h
View File

@@ -28,6 +28,11 @@ CCL_NAMESPACE_BEGIN
#if (__cplusplus > 199711L) || (defined(_MSC_VER) && _MSC_VER >= 1800)
# define function_bind std::bind
# ifdef _MSC_VER
# define function_null nullptr
# else
# define function_null NULL
#endif
using std::function;
using std::placeholders::_1;
using std::placeholders::_2;
@@ -41,6 +46,7 @@ using std::placeholders::_9;
#else
using boost::function;
# define function_bind boost::bind
# define function_null NULL
#endif
CCL_NAMESPACE_END

4
intern/cycles/util/util_progress.h
View File

@@ -44,12 +44,12 @@ public:
substatus = "";
sync_status = "";
sync_substatus = "";
update_cb = NULL;
update_cb = function_null;
cancel = false;
cancel_message = "";
error = false;
error_message = "";
cancel_cb = NULL;
cancel_cb = function_null;
}
Progress(Progress& progress)