fixed some more variable name changes to get s_s3dRayTraceLinearityTest.m to work
Merge branch 'lens-bw' of https://github.com/ydnality/Scene3D into lens-bw

Conflicts:
	classes/@ppsfCameraC/ppsfCameraC.m
	scripts/rayTrace/s_s3dRayTraceLinearityTest.m