archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'blender2.7'

Browse Source
This commit is contained in:
Stefan Werner
2019-03-05 15:06:09 +01:00
parent cb7e66737d db7f9a70b0
commit c891fb2fbe
20 changed files with 452 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
intern/cycles/render/scene.cpp
View File

@@ -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),