diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-05-21 13:26:36 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-21 13:26:36 +0300 |
| commit | 21777533fbef067fd680db9b6c6e5e79b823af9d (patch) | |
| tree | 0d4498e055501217a0b4f3481f8097cc9f060ebf /intern | |
| parent | 0e9605f44d2611b16fc7b4541aee33b4c681426c (diff) | |
| parent | 6d8aa8505115c03ab2a50489f23fe36dea8cd564 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/render/mesh.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/render/mesh.cpp b/intern/cycles/render/mesh.cpp index 7cfbb7b7c7d..7a9d604244d 100644 --- a/intern/cycles/render/mesh.cpp +++ b/intern/cycles/render/mesh.cpp @@ -1307,7 +1307,7 @@ void MeshManager::update_svm_attributes(Device *, DeviceScene *dscene, Scene *sc return; /* create attribute map */ - uint4 *attr_map = dscene->attributes_map.alloc(attr_map_size*scene->meshes.size()); + uint4 *attr_map = dscene->attributes_map.alloc(attr_map_size); memset(attr_map, 0, dscene->attributes_map.size()*sizeof(uint)); for(size_t i = 0; i < scene->meshes.size(); i++) { |