diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-03-29 16:03:47 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-03-29 16:03:47 +0400 |
| commit | e8b1cfed0a3afbf69b5bd5a7e0a51381622e844f (patch) | |
| tree | 8416fab6524a7041edf5dc95539ce1973092f9e9 /intern/cycles/kernel/kernel_camera.h | |
| parent | 6997908afc38a3c98d09939f3b46f10d7a165d2e (diff) | |
Cycles code refactor: replace magic ~0 values in the code with defines.
Diffstat (limited to 'intern/cycles/kernel/kernel_camera.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_camera.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/kernel_camera.h b/intern/cycles/kernel/kernel_camera.h index fe995bbb594..7fc66a9fdee 100644 --- a/intern/cycles/kernel/kernel_camera.h +++ b/intern/cycles/kernel/kernel_camera.h @@ -266,7 +266,7 @@ ccl_device_inline float3 camera_world_to_ndc(KernelGlobals *kg, ShaderData *sd, { if(kernel_data.cam.type != CAMERA_PANORAMA) { /* perspective / ortho */ - if(sd->object == ~0 && kernel_data.cam.type == CAMERA_PERSPECTIVE) + if(sd->object == PRIM_NONE && kernel_data.cam.type == CAMERA_PERSPECTIVE) P += camera_position(kg); Transform tfm = kernel_data.cam.worldtondc; @@ -276,7 +276,7 @@ ccl_device_inline float3 camera_world_to_ndc(KernelGlobals *kg, ShaderData *sd, /* panorama */ Transform tfm = kernel_data.cam.worldtocamera; - if(sd->object != ~0) + if(sd->object != OBJECT_NONE) P = normalize(transform_point(&tfm, P)); else P = normalize(transform_direction(&tfm, P)); |