diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-11-10 12:13:19 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-11-10 12:13:19 +0300 |
| commit | 7a6ad2901cce23d47c3a0618b4791d4eb034a6c5 (patch) | |
| tree | abf9644577d5b7adcfb196ea74b81c5ee9e7e4d1 /intern/cycles/render | |
| parent | 7defb27f084288e0218f068aec74a693a0ca9b6a (diff) | |
| parent | a466d7ae248b2807b4e2f8693b458d3da509e9bc (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/render')
| -rw-r--r-- | intern/cycles/render/mesh.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/render/object.cpp | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/intern/cycles/render/mesh.cpp b/intern/cycles/render/mesh.cpp index 189ba80ad2a..4353fd4b819 100644 --- a/intern/cycles/render/mesh.cpp +++ b/intern/cycles/render/mesh.cpp @@ -2170,6 +2170,8 @@ void MeshManager::device_free(Device *device, DeviceScene *dscene) og->attribute_map.clear(); og->object_names.clear(); } +#else + (void)device; #endif } diff --git a/intern/cycles/render/object.cpp b/intern/cycles/render/object.cpp index c70111d15b0..aef7fc29573 100644 --- a/intern/cycles/render/object.cpp +++ b/intern/cycles/render/object.cpp @@ -420,6 +420,7 @@ void ObjectManager::device_update_object_transform(UpdateObejctTransformState *s objects[offset+9] = make_float4(ob->dupli_generated[0], ob->dupli_generated[1], ob->dupli_generated[2], __int_as_float(numkeys)); objects[offset+10] = make_float4(ob->dupli_uv[0], ob->dupli_uv[1], __int_as_float(numsteps), __int_as_float(numverts)); + objects[offset+11] = make_float4(0.0f, 0.0f, 0.0f, 0.0f); /* Object flag. */ if(ob->use_holdout) { |