diff options
Diffstat (limited to 'intern/cycles/render')
-rw-r--r-- | intern/cycles/render/light.cpp | 3 | ||||
-rw-r--r-- | intern/cycles/render/mesh_displace.cpp | 3 |
2 files changed, 1 insertions, 5 deletions
diff --git a/intern/cycles/render/light.cpp b/intern/cycles/render/light.cpp index 787e5cf07b2..b6c45dda231 100644 --- a/intern/cycles/render/light.cpp +++ b/intern/cycles/render/light.cpp @@ -309,9 +309,6 @@ void LightManager::device_update_distribution(Device *device, DeviceScene *dscen int object_id = j; int shader_flag = 0; - if(transform_applied) - object_id = ~object_id; - if(!(object->visibility & PATH_RAY_DIFFUSE)) { shader_flag |= SHADER_EXCLUDE_DIFFUSE; use_light_visibility = true; diff --git a/intern/cycles/render/mesh_displace.cpp b/intern/cycles/render/mesh_displace.cpp index ef9cfedd412..adc5b820298 100644 --- a/intern/cycles/render/mesh_displace.cpp +++ b/intern/cycles/render/mesh_displace.cpp @@ -86,8 +86,7 @@ bool MeshManager::displace(Device *device, DeviceScene *dscene, Scene *scene, Me done[t.v[j]] = true; /* set up object, primitive and barycentric coordinates */ - /* when used, non-instanced convention: object = ~object */ - int object = ~object_index; + int object = object_index; int prim = mesh->tri_offset + i; float u, v; |