diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-05-04 19:30:02 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-05-04 19:30:02 +0400 |
| commit | e86dbf687769a7f38ab465c89d1111a8be691ca2 (patch) | |
| tree | 709daceab4b5cbab4564b481a5579895c286629b /intern/cycles/render/object.cpp | |
| parent | 2a3cdeadf11d29a2321d5d19929c82f19d8ec186 (diff) | |
Code cleanup: avoid int/uint mixup in cycles
Diffstat (limited to 'intern/cycles/render/object.cpp')
| -rw-r--r-- | intern/cycles/render/object.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/intern/cycles/render/object.cpp b/intern/cycles/render/object.cpp index b58caab5efa..750fae98662 100644 --- a/intern/cycles/render/object.cpp +++ b/intern/cycles/render/object.cpp @@ -288,8 +288,11 @@ void ObjectManager::device_update_transforms(Device *device, DeviceScene *dscene /* pack in texture */ int offset = i*OBJECT_SIZE; + /* OBJECT_TRANSFORM */ memcpy(&objects[offset], &tfm, sizeof(float4)*3); + /* OBJECT_INVERSE_TRANSFORM */ memcpy(&objects[offset+4], &itfm, sizeof(float4)*3); + /* OBJECT_PROPERTIES */ objects[offset+8] = make_float4(surface_area, pass_id, random_number, __int_as_float(particle_index)); if(need_motion == Scene::MOTION_PASS) { |