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

Optionally use c++11 stuff instead of boost in cycles where possible. We do and continue to depend on boost though

Browse Source 
Reviewers: dingto, sergey

Reviewed By: sergey

Subscribers: #cycles

Differential Revision: https://developer.blender.org/D1185
This commit is contained in:
Martijn Berger
2015-03-29 22:12:22 +02:00
parent 70d9c01325
commit f01456aaa4
13 changed files with 129 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
intern/cycles/render/image.h
View File

@@ -73,9 +73,9 @@ public:
bool need_update;
boost::function<void(const string &filename, void *data, bool &is_float, int &width, int &height, int &depth, int &channels)> builtin_image_info_cb;
boost::function<bool(const string &filename, void *data, unsigned char *pixels)> builtin_image_pixels_cb;
boost::function<bool(const string &filename, void *data, float *pixels)> builtin_image_float_pixels_cb;
function<void(const string &filename, void *data, bool &is_float, int &width, int &height, int &depth, int &channels)> builtin_image_info_cb;
function<bool(const string &filename, void *data, unsigned char *pixels)> builtin_image_pixels_cb;
function<bool(const string &filename, void *data, float *pixels)> builtin_image_float_pixels_cb;
struct Image {
string filename;