diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-08-08 17:43:25 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-08-08 17:43:25 +0300 |
commit | e8b6bcd65c946f5eb9623638eebcd93ed74d9358 (patch) | |
tree | 2def0bada18cc84e8315dc20681d1928cf219fbb /intern/cycles/render/scene.h | |
parent | cf8add42b807449e6f96f8ecab637d52e166052f (diff) | |
parent | ddfd57c0d275e6222f9622379b4c716e868029ce (diff) |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/editors/object/object_add.c
source/blender/python/intern/bpy_app_handlers.c
Diffstat (limited to 'intern/cycles/render/scene.h')
-rw-r--r-- | intern/cycles/render/scene.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/intern/cycles/render/scene.h b/intern/cycles/render/scene.h index 4c2c4f5fcc3..0194327f567 100644 --- a/intern/cycles/render/scene.h +++ b/intern/cycles/render/scene.h @@ -121,13 +121,6 @@ public: vector<device_vector<uchar>* > tex_byte_image; vector<device_vector<half>* > tex_half_image; - /* opencl images */ - device_vector<float4> tex_image_float4_packed; - device_vector<uchar4> tex_image_byte4_packed; - device_vector<float> tex_image_float_packed; - device_vector<uchar> tex_image_byte_packed; - device_vector<uint4> tex_image_packed_info; - KernelData data; }; |