[Bf-blender-cvs] [edeeb78] multiview: cleanup, using r_ for return parameters

[Dalai Felinto]

Commit: edeeb7866ffc5f74d59aede1a149e4abcb89f0ed
Author: Dalai Felinto
Date:   Fri May 23 12:06:10 2014 -0300
https://developer.blender.org/rBedeeb7866ffc5f74d59aede1a149e4abcb89f0ed

cleanup, using r_ for return parameters

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

M	source/blender/blenkernel/BKE_camera.h
M	source/blender/blenkernel/intern/camera.c

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

diff --git a/source/blender/blenkernel/BKE_camera.h b/source/blender/blenkernel/BKE_camera.h
index d09fd20..e50e341 100644
--- a/source/blender/blenkernel/BKE_camera.h
+++ b/source/blender/blenkernel/BKE_camera.h
@@ -122,7 +122,7 @@ bool BKE_camera_view_frame_fit_to_scene(struct Scene *scene, struct View3D *v3d,
                                         float r_co[3]);
 
 struct Object *BKE_camera_multiview_advanced(struct Scene *scene, struct RenderData *rd, struct Object *camera, const char *suffix);
-void BKE_camera_stereo_matrices(struct Object *camera, float viewmat[4][4], float *shift, bool left);
+void BKE_camera_stereo_matrices(struct Object *camera, float r_viewmat[4][4], float *r_shift, const bool left);
 
 #ifdef __cplusplus
 }
diff --git a/source/blender/blenkernel/intern/camera.c b/source/blender/blenkernel/intern/camera.c
index 5257eb9..2768a80 100644
--- a/source/blender/blenkernel/intern/camera.c
+++ b/source/blender/blenkernel/intern/camera.c
@@ -601,7 +601,7 @@ bool BKE_camera_view_frame_fit_to_scene(Scene *scene, struct View3D *v3d, Object
 	}
 }
 
-void BKE_camera_stereo_matrices(Object *camera, float viewmat[4][4], float *shift, bool left)
+void BKE_camera_stereo_matrices(Object *camera, float r_viewmat[4][4], float *r_shift, const bool left)
 {
 	/* viewmat = MODELVIEW_MATRIX */
 	Camera *data = (Camera *)camera->data;
@@ -646,15 +646,15 @@ void BKE_camera_stereo_matrices(Object *camera, float viewmat[4][4], float *shif
 	mul_m4_m4m4( tmpviewmat, transmat, tmpviewmat) ;
 
 	/* copy  */
-	copy_m4_m4(viewmat, tmpviewmat);
+	copy_m4_m4(r_viewmat, tmpviewmat);
 
 	/* prepare the camera shift for the projection matrix */
 	/* Note: in viewport, parallel renders as offaxis, but in render it does parallel */
 	if (ELEM(convergence_mode, CAM_S3D_OFFAXIS, CAM_S3D_PARALLEL)) {
 		if (left)
-			*shift += ((interocular_distance / data->sensor_x) * (data->lens / convergence_distance)) * 0.5;
+			*r_shift += ((interocular_distance / data->sensor_x) * (data->lens / convergence_distance)) * 0.5;
 		else
-			*shift -= ((interocular_distance / data->sensor_x) * (data->lens / convergence_distance)) * 0.5;
+			*r_shift -= ((interocular_distance / data->sensor_x) * (data->lens / convergence_distance)) * 0.5;
 	}
 }