[Bf-blender-cvs] [d76d63b] testbuild: Revert "Anamorphic Lens - test patch (only works when blades == 0)"

[Dalai Felinto]

Commit: d76d63bf64472254c0c6050ab8762bba20b73af4
Author: Dalai Felinto
Date:   Thu Aug 14 16:26:01 2014 +0200
Branches: testbuild
https://developer.blender.org/rBd76d63bf64472254c0c6050ab8762bba20b73af4

Revert "Anamorphic Lens - test patch (only works when blades == 0)"

This reverts commit 869945f37432b6762e8486c904e178236354aa8e.

===================================================================

M	intern/cycles/blender/addon/properties.py
M	intern/cycles/blender/addon/ui.py
M	intern/cycles/blender/blender_camera.cpp
M	intern/cycles/kernel/kernel_camera.h
M	intern/cycles/kernel/kernel_types.h
M	intern/cycles/render/camera.cpp
M	intern/cycles/render/camera.h

===================================================================

diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py
index d3fff84..b4a1b10 100644
--- a/intern/cycles/blender/addon/properties.py
+++ b/intern/cycles/blender/addon/properties.py
@@ -544,14 +544,6 @@ class CyclesCameraSettings(bpy.types.PropertyGroup):
                 subtype='ANGLE',
                 default=0,
                 )
-        cls.anamorphic_factor = FloatProperty(
-                name="Anamorphic Lens",
-                description="Lens for anamorphic distortion",
-                min=0.1,
-                subtype='DISTANCE',
-                precision=4,
-                default=1,
-                )
         cls.panorama_type = EnumProperty(
                 name="Panorama Type",
                 description="Distortion to use for the calculation",
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index 8d63b8b..4a13f26 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -469,9 +469,6 @@ class CyclesCamera_PT_dof(CyclesButtonsPanel, Panel):
         sub.prop(ccam, "aperture_blades", text="Blades")
         sub.prop(ccam, "aperture_rotation", text="Rotation")
 
-        col.separator()
-        col.prop(ccam, "anamorphic_factor")
-
 
 class Cycles_PT_context_material(CyclesButtonsPanel, Panel):
     bl_label = ""
diff --git a/intern/cycles/blender/blender_camera.cpp b/intern/cycles/blender/blender_camera.cpp
index 8725b5b..1a85561 100644
--- a/intern/cycles/blender/blender_camera.cpp
+++ b/intern/cycles/blender/blender_camera.cpp
@@ -46,8 +46,6 @@ struct BlenderCamera {
 
 	float2 pixelaspect;
 
-	float anamorphic;
-
 	PanoramaType panorama_type;
 	float fisheye_fov;
 	float fisheye_lens;
@@ -169,7 +167,6 @@ static void blender_camera_from_object(BlenderCamera *bcam, BL::Object b_ob, boo
 		bcam->apertureblades = RNA_int_get(&ccamera, "aperture_blades");
 		bcam->aperturerotation = RNA_float_get(&ccamera, "aperture_rotation");
 		bcam->focaldistance = blender_camera_focal_distance(b_ob, b_camera);
-		bcam->anamorphic = RNA_float_get(&ccamera, "anamorphic_factor");
 
 		bcam->shift.x = b_camera.shift_x();
 		bcam->shift.y = b_camera.shift_y();
@@ -331,9 +328,6 @@ static void blender_camera_sync(Camera *cam, BlenderCamera *bcam, int width, int
 	cam->fisheye_fov = bcam->fisheye_fov;
 	cam->fisheye_lens = bcam->fisheye_lens;
 
-	/* anamorphic */
-	cam->anamorphic = bcam->anamorphic;
-
 	/* perspective */
 	cam->fov = 2.0f * atanf((0.5f * sensor_size) / bcam->lens / aspectratio);
 	cam->focaldistance = bcam->focaldistance;
diff --git a/intern/cycles/kernel/kernel_camera.h b/intern/cycles/kernel/kernel_camera.h
index 2b06435..6b03abe 100644
--- a/intern/cycles/kernel/kernel_camera.h
+++ b/intern/cycles/kernel/kernel_camera.h
@@ -21,12 +21,6 @@ CCL_NAMESPACE_BEGIN
 ccl_device float2 camera_sample_aperture(KernelGlobals *kg, float u, float v)
 {
 	float blades = kernel_data.cam.blades;
-	float anamorphic = kernel_data.cam.anamorphic;
-
-	/* apply anamorphic effect */
-	if(anamorphic != 1.0f) {
-		u = ((((u * 2.0f) - 1.0f) * (1.0f / anamorphic)) + 1.0f) * 0.5f;
-	}
 
 	if(blades == 0.0f) {
 		/* sample disk */
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h
index 8fa1350..0ee7e60 100644
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@ -758,11 +758,9 @@ typedef struct KernelCamera {
 	/* render size */
 	float width, height;
 	int resolution;
-
-	/* anamorphic lens */
-	float anamorphic;
 	int pad1;
 	int pad2;
+	int pad3;
 
 	/* more matrices */
 	Transform screentoworld;
diff --git a/intern/cycles/render/camera.cpp b/intern/cycles/render/camera.cpp
index ada7881..8659fe4 100644
--- a/intern/cycles/render/camera.cpp
+++ b/intern/cycles/render/camera.cpp
@@ -38,8 +38,6 @@ Camera::Camera()
 	motion.post = transform_identity();
 	use_motion = false;
 
-	anamorphic = 1.0f;
-
 	type = CAMERA_PERSPECTIVE;
 	panorama_type = PANORAMA_EQUIRECTANGULAR;
 	fisheye_fov = M_PI_F;
@@ -243,9 +241,6 @@ void Camera::device_update(Device *device, DeviceScene *dscene, Scene *scene)
 	/* type */
 	kcam->type = type;
 
-	/* anamorphy */
-	kcam->anamorphic = anamorphic;
-
 	/* panorama */
 	kcam->panorama_type = panorama_type;
 	kcam->fisheye_fov = fisheye_fov;
@@ -296,7 +291,6 @@ bool Camera::modified(const Camera& cam)
 		(viewplane == cam.viewplane) &&
 		(border == cam.border) &&
 		(matrix == cam.matrix) &&
-		(anamorphic == cam.anamorphic) &&
 		(panorama_type == cam.panorama_type) &&
 		(fisheye_fov == cam.fisheye_fov) &&
 		(fisheye_lens == cam.fisheye_lens));
diff --git a/intern/cycles/render/camera.h b/intern/cycles/render/camera.h
index 7c4c561..c28670b 100644
--- a/intern/cycles/render/camera.h
+++ b/intern/cycles/render/camera.h
@@ -54,9 +54,6 @@ public:
 	float fisheye_fov;
 	float fisheye_lens;
 
-	/* anamorphy */
-	float anamorphic;
-
 	/* sensor */
 	float sensorwidth;
 	float sensorheight;