Shape From Focus/Defocus (SFF/SFD) has been known as a depth estimation technique by using focus information. The technique estimates the depth for each point of a target object based on a focus measure extracted for each block on a set of multi-focus images. The authors previously proposed an SFF/SFD technique that uses the data from multiple viewpoints. However, the technique has not taken into account the shape of the square block from another viewpoint. In this paper, we propose a new version of the technique in which such block shape is adaptively modified depending on each viewpoint. The algorithm for finding the optimal depth-estimate is also simplified in comparison to that of the old version.