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.cpp | |
| parent | cb7e66737d2d2d0628dda49ddb7d5541915d017b (diff) | |
| parent | db7f9a70b0addd17a2f8a8d87c0b4d77d78b536e (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'intern/cycles/render/scene.cpp')
| -rw-r--r-- | intern/cycles/render/scene.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/intern/cycles/render/scene.cpp b/intern/cycles/render/scene.cpp index 23233b4e29e..1f551f206ef 100644 --- a/intern/cycles/render/scene.cpp +++ b/intern/cycles/render/scene.cpp @@ -66,6 +66,7 @@ DeviceScene::DeviceScene(Device *device) camera_motion(device, "__camera_motion", MEM_TEXTURE), attributes_map(device, "__attributes_map", MEM_TEXTURE), attributes_float(device, "__attributes_float", MEM_TEXTURE), + attributes_float2(device, "__attributes_float2", MEM_TEXTURE), attributes_float3(device, "__attributes_float3", MEM_TEXTURE), attributes_uchar4(device, "__attributes_uchar4", MEM_TEXTURE), light_distribution(device, "__light_distribution", MEM_TEXTURE), |