blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Cycles: Cleanup, use ccl::vector instead of std::vector

This commit is contained in:
Sergey Sharybin 2017-04-28 13:22:07 +02:00
parent 4245ed360e
commit 20ebeb1a15
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
intern/cycles/render/scene.h
View File

@ -114,12 +114,12 @@ public:
device_vector<uint> sobol_directions;
/* cpu images */
std::vector<device_vector<float4>* > tex_float4_image;
std::vector<device_vector<uchar4>* > tex_byte4_image;
std::vector<device_vector<half4>* > tex_half4_image;
std::vector<device_vector<float>* > tex_float_image;
std::vector<device_vector<uchar>* > tex_byte_image;
std::vector<device_vector<half>* > tex_half_image;
vector<device_vector<float4>* > tex_float4_image;
vector<device_vector<uchar4>* > tex_byte4_image;
vector<device_vector<half4>* > tex_half4_image;
vector<device_vector<float>* > tex_float_image;
vector<device_vector<uchar>* > tex_byte_image;
vector<device_vector<half>* > tex_half_image;
/* opencl images */
device_vector<float4> tex_image_float4_packed;