Code cleanup: avoid int/uint mixup in cycles

2014-05-05 01:30:02 +10:00
parent 2a3cdeadf1
commit e86dbf6877
4 changed files with 24 additions and 20 deletions
--- 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) {