svn merge ^/trunk/blender -r46380:46390
authorOve Murberg Henriksen <sorayasilvermoon@hotmail.com>
Tue, 8 May 2012 00:12:47 +0000 (00:12 +0000)
committerOve Murberg Henriksen <sorayasilvermoon@hotmail.com>
Tue, 8 May 2012 00:12:47 +0000 (00:12 +0000)
1  2 
intern/cycles/kernel/kernel_camera.h
intern/cycles/kernel/kernel_path.h
intern/cycles/kernel/kernel_types.h
intern/cycles/render/camera.cpp
source/blender/editors/curve/editcurve.c
source/blender/editors/render/render_opengl.c
source/blender/editors/space_clip/clip_ops.c
source/blender/editors/space_image/image_ops.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/modifiers/intern/MOD_solidify.c

@@@ -132,21 -132,8 +132,8 @@@ __device void camera_sample_orthographi
  #endif
  }
  
 -/* Panorama Camera */
 +/* Environment Camera */
  
- __device float3 panorama_to_direction(KernelGlobals *kg, float u, float v)
- {
-       switch(kernel_data.cam.panorama_type) {
-               case PANORAMA_EQUIRECTANGULAR:
-                       return equirectangular_to_direction(u, v);
-               case PANORAMA_FISHEYE_EQUIDISTANT:
-                       return fisheye_to_direction(u, v, kernel_data.cam.fisheye_fov);
-               case PANORAMA_FISHEYE_EQUISOLID:
-               default:
-                       return fisheye_equisolid_to_direction(u, v, kernel_data.cam.fisheye_lens, kernel_data.cam.fisheye_fov, kernel_data.cam.sensorwidth, kernel_data.cam.sensorheight);
-       }
- }
  __device void camera_sample_panorama(KernelGlobals *kg, float raster_x, float raster_y, Ray *ray)
  {
        Transform rastertocamera = kernel_data.cam.rastertocamera;
Simple merge
Simple merge
@@@ -181,6 -199,19 +193,10 @@@ void Camera::device_update(Device *devi
        /* type */
        kcam->type = type;
  
 -      /* panorama */
 -      kcam->panorama_type = panorama_type;
 -      kcam->fisheye_fov = fisheye_fov;
 -      kcam->fisheye_lens = fisheye_lens;
 -
 -      /* sensor size */
 -      kcam->sensorwidth = sensorwidth;
 -      kcam->sensorheight = sensorheight;
 -
+       /* render size */
+       kcam->width = width;
+       kcam->height = height;
        /* store differentials */
        kcam->dx = float3_to_float4(dx);
        kcam->dy = float3_to_float4(dy);