[Bf-blender-cvs] [20ebeb1a155] master: Cycles: Cleanup, use ccl::vector instead of std::vector

[Sergey Sharybin]

Commit: 20ebeb1a155640f91e3eaf42399be3b42f97b6fc
Author: Sergey Sharybin
Date:   Fri Apr 28 13:22:07 2017 +0200
Branches: master
https://developer.blender.org/rB20ebeb1a155640f91e3eaf42399be3b42f97b6fc

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

===================================================================

M	intern/cycles/render/scene.h

===================================================================

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;