diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-04-28 14:22:07 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-04-28 14:22:07 +0300 |
| commit | 20ebeb1a155640f91e3eaf42399be3b42f97b6fc (patch) | |
| tree | 5f179af097e2222f60b2252875908591cc97227d /intern/cycles/render/scene.h | |
| parent | 4245ed360e587fec1bdd2c3bac3b318865bba8bc (diff) | |
Cycles: Cleanup, use ccl::vector instead of std::vector
Diffstat (limited to 'intern/cycles/render/scene.h')
| -rw-r--r-- | intern/cycles/render/scene.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/intern/cycles/render/scene.h b/intern/cycles/render/scene.h index 09f239f09eb..4c2c4f5fcc3 100644 --- a/intern/cycles/render/scene.h +++ b/intern/cycles/render/scene.h @@ -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; |