diff options
| author | Stefan Werner <stefan.werner@tangent-animation.com> | 2019-03-05 17:06:09 +0300 |
|---|---|---|
| committer | Stefan Werner <stefan.werner@tangent-animation.com> | 2019-03-05 17:06:09 +0300 |
| commit | c891fb2fbe99362ac8f3ff0821b32b84566f8f1c (patch) | |
| tree | e410c45d5413058780cc6ae6b1a5033c80386c22 /intern/cycles/render/scene.h | |
| parent | cb7e66737d2d2d0628dda49ddb7d5541915d017b (diff) | |
| parent | db7f9a70b0addd17a2f8a8d87c0b4d77d78b536e (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'intern/cycles/render/scene.h')
| -rw-r--r-- | intern/cycles/render/scene.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/intern/cycles/render/scene.h b/intern/cycles/render/scene.h index 69cbfe9a324..e43800fe5c4 100644 --- a/intern/cycles/render/scene.h +++ b/intern/cycles/render/scene.h @@ -98,6 +98,7 @@ public: /* attributes */ device_vector<uint4> attributes_map; device_vector<float> attributes_float; + device_vector<float2> attributes_float2; device_vector<float4> attributes_float3; device_vector<uchar4> attributes_uchar4; |